From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by dpdk.org (Postfix) with ESMTP id 4E0162C8 for ; Tue, 20 Jun 2017 13:37:37 +0200 (CEST) Received: by mail-pf0-f193.google.com with SMTP id y7so22254422pfd.3 for ; Tue, 20 Jun 2017 04:37:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=aA226ICkNMHHc14b4mAK4luRoJNtRbAkugpUYWe2+VY=; b=rrgEHjLSI1SgJHdGTOPlSIAV2oBmIoCXWEGjme9RZQH116RFoenL/kIB70AqOLDTZP upnZx9U7dJTC+h59q6RS43ZPzy7+4S/5PfoYeVaCUd0Ww5Y5UMuiYUbVMq91YFboVIVr TbVr0EyFttR/eY9/0TGI3HPcxwuNtawKl+QHNjFqFGXxOxXD4gKMGqbF2qNO9pZyYC2i e+LOsGmZJ/P0YX7/gTtRmJBOoEIjTYj1FYf/Bn8cyRvE6Pirxm6Yu/RUwErd8p+lUlhA 4F/HzfqhthVKlxVQuHma6jnR9WV8vMMQy+0moZnRJ6xxY8EnmfNLgccXG5cBerWCJxL4 Ceyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=aA226ICkNMHHc14b4mAK4luRoJNtRbAkugpUYWe2+VY=; b=eLYigkpzci+ghV3vh1uT69coC3E4dlK16XI2WlhM1gi9z/gChGvbC1IjfmeXIDMbeF 5pPZ0HHLtO89Hjmhv39DcLHmEFmHDQpqucKJNZ2iW0Wc59T1M9Q+DcnisEddh2wKhqqm AvDkF79mlm6PgLW82wJ9lDy31m3wJoktm/RjXx3nBVMxSlaA59/SGhW66YD/1f36vqZP CNMDxys4B2ZI+Ok1SP5b0igzmbGciETQPNDC60a/ENl59aYUtDK1nmqg3o3yroEY3L1x QT4fE/rI60ItExqvI+/g1Y249/o9Sl8mluX8OckHUJ7mVspgZ8yEhLAnVIFUV/x4NM0D DRJA== X-Gm-Message-State: AKS2vOxcwIwSkCJiVCifFxhKCz6sGwuvoemuJaPQfQ1LEHjnds5GN0N5 IvmmTGDEFLmI3bDr X-Received: by 10.98.156.131 with SMTP id u3mr30376956pfk.16.1497958656628; Tue, 20 Jun 2017 04:37:36 -0700 (PDT) Received: from yliu-home.localdomain ([45.63.61.64]) by smtp.gmail.com with ESMTPSA id 25sm6104783pfj.59.2017.06.20.04.37.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Jun 2017 04:37:35 -0700 (PDT) From: Yuanhan Liu To: Yongseok Koh Cc: Adrien Mazarguil , dpdk stable Date: Tue, 20 Jun 2017 19:35:34 +0800 Message-Id: <1497958550-13600-22-git-send-email-yliu@fridaylinux.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1497958550-13600-1-git-send-email-yliu@fridaylinux.org> References: <1497958550-13600-1-git-send-email-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'net/mlx5: fix exception handling' has been queued to stable release 17.05.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Jun 2017 11:37:37 -0000 Hi, FYI, your patch has been queued to stable release 17.05.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/22/17. So please shout if anyone has objections. Thanks. --yliu --- >>From be4fa40365a792937bbaa5a9f448e4a333dc744e Mon Sep 17 00:00:00 2001 From: Yongseok Koh Date: Mon, 29 May 2017 18:02:59 -0700 Subject: [PATCH] net/mlx5: fix exception handling [ upstream commit 70aee77ec6284d18ae30486b545b0527c2082bce ] A sanity check is required in priv_fdir_disable(). If resizing Rx queue fails, this can cause a crash by referencing a NULL pointer. Fixes: 76f5c99e6840 ("mlx5: support flow director") Fixes: 0cdddf4d0626 ("net/mlx5: split Rx queue structure") Signed-off-by: Yongseok Koh Acked-by: Adrien Mazarguil --- drivers/net/mlx5/mlx5_fdir.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_fdir.c b/drivers/net/mlx5/mlx5_fdir.c index f80c58b..1cff41b 100644 --- a/drivers/net/mlx5/mlx5_fdir.c +++ b/drivers/net/mlx5/mlx5_fdir.c @@ -733,9 +733,11 @@ priv_fdir_disable(struct priv *priv) /* Destroy flow director context in each RX queue. */ for (i = 0; (i != priv->rxqs_n); i++) { - struct rxq_ctrl *rxq_ctrl = - container_of((*priv->rxqs)[i], struct rxq_ctrl, rxq); + struct rxq_ctrl *rxq_ctrl; + if (!(*priv->rxqs)[i]) + continue; + rxq_ctrl = container_of((*priv->rxqs)[i], struct rxq_ctrl, rxq); if (!rxq_ctrl->fdir_queue) continue; priv_fdir_queue_destroy(priv, rxq_ctrl->fdir_queue); -- 2.7.4