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 4D7B729CB for ; Fri, 14 Jul 2017 12:35:05 +0200 (CEST) Received: by mail-pf0-f193.google.com with SMTP id q85so10552733pfq.2 for ; Fri, 14 Jul 2017 03:35:05 -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=1y8y/xqezWihQpiiNKgJMJGd9dwMOaMRcx2qCLxMAlw=; b=hxA0Dj6hzfJp858960jT+S92VHnSyuuZIXFKqaViyml8I24eJ6NuGq99ofEBVMVaiF J9ruWmYju8+cJRaOLhQT7f56Gdi7iP7Fr1RtaXNB3i8w9vrV/UXxRgbGFBW/l38BXKxT A59x8MXwfJw+1SB8xq2aA9jculTWAG4X8u4AFo7lJlYPMwh6B6B2rYz0hVkHw7xcJ/al oIKA6HxFyXaOAqJWcjwWQRlvoMFAuMeTicp4/pCJEKJy1EcX4jz/IcX8Pygt7merUEY1 6shT8dQXX/XZpAiOiMatb3sBjliPq8bAUZwDnbtesp8OeG0tTOgQ4BRGKYBp4mzXI/8j 0GwQ== 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=1y8y/xqezWihQpiiNKgJMJGd9dwMOaMRcx2qCLxMAlw=; b=DhkBTYlm5ImHyYl9z7aWYhFjhiza2ZZ7lNax9IpwpEy16hdrYe7G77G6G5dwePIUJ3 CKIP7GOADLU20B7QvMwrRMErhcFUq4WmiEwJMI28HOkRCiN3QoUgAjhAKhW9oEguccSh bFmB41ep6RZNe85PaMZ951XFCjnb/UhSDem402TCMth+f/TtlnhbQEsxnAsQ7PYQFmLD RaDWFJak0FhnSdKlHdDwTWMT1xK3zttS77iGv8YM61HyAbzmiM2mT5gqYO9ef9oWUFCu Oqw6hWxjpgsSbqbh92NRCiklG8Ryd19W+OJjhb7ReajaEPMPzEgxMlhb2DiMybLTW2lB q/YQ== X-Gm-Message-State: AIVw112CNyUc/BS24PYlqcGXJPo9E9WV9MY6Q/jJlqBMP7ZTPcL1JljX JuFIpNY4AvxVnlg7LCt9+Web X-Received: by 10.99.101.132 with SMTP id z126mr13931573pgb.64.1500028504632; Fri, 14 Jul 2017 03:35:04 -0700 (PDT) Received: from localhost.localdomain ([180.158.48.171]) by smtp.gmail.com with ESMTPSA id y205sm15273553pfb.124.2017.07.14.03.35.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 14 Jul 2017 03:35:03 -0700 (PDT) From: Yuanhan Liu To: Yongseok Koh Cc: Adrien Mazarguil , dpdk stable Date: Fri, 14 Jul 2017 18:33:30 +0800 Message-Id: <1500028450-25989-6-git-send-email-yliu@fridaylinux.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1500028450-25989-1-git-send-email-yliu@fridaylinux.org> References: <1500028450-25989-1-git-send-email-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'net/mlx5: fix exception handling' has been queued to LTS release 16.11.3 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: Fri, 14 Jul 2017 10:35:05 -0000 Hi, FYI, your patch has been queued to LTS release 16.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/19/17. So please shout if anyone has objections. Thanks. --yliu --- >>From 9a11edd11af9542ddcdfdc78e06da393c71dcd41 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 1acf682..70a5dd0 100644 --- a/drivers/net/mlx5/mlx5_fdir.c +++ b/drivers/net/mlx5/mlx5_fdir.c @@ -731,9 +731,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