From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id CC8731B550 for ; Fri, 30 Nov 2018 16:25:36 +0100 (CET) X-Amp-Result: UNSCANNABLE X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 30 Nov 2018 07:25:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,299,1539673200"; d="scan'208";a="120394099" Received: from btwcube1.sh.intel.com (HELO debian) ([10.67.104.173]) by fmsmga001.fm.intel.com with ESMTP; 30 Nov 2018 07:25:34 -0800 Date: Fri, 30 Nov 2018 23:23:45 +0800 From: Tiwei Bie To: Yongseok Koh Cc: Maxime Coquelin , dpdk stable Message-ID: <20181130152345.GA13586@debian> References: <20181129231202.30436-1-yskoh@mellanox.com> <20181129231202.30436-106-yskoh@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20181129231202.30436-106-yskoh@mellanox.com> User-Agent: Mutt/1.10.1 (2018-07-13) Subject: Re: [dpdk-stable] patch 'net/virtio: fix unchecked return value' has been queued to LTS release 17.11.5 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, 30 Nov 2018 15:25:37 -0000 On Thu, Nov 29, 2018 at 03:11:40PM -0800, Yongseok Koh wrote: > Hi, > > FYI, your patch has been queued to LTS release 17.11.5 > > Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. > It will be pushed if I get no objections before 12/01/18. So please > shout if anyone has objections. Hi, This patch can't be backported, as it depends on some API change in newer release. Thanks, Tiwei > > Also note that after the patch there's a diff of the upstream commit vs the patch applied > to the branch. If the code is different (ie: not only metadata diffs), due for example to > a change in context or macro names, please double check it. > > Thanks. > > Yongseok > > --- > From 85fa65d2e2a0b9e0ac4baa0ff2c5f99bed5427ec Mon Sep 17 00:00:00 2001 > From: Tiwei Bie > Date: Wed, 7 Nov 2018 17:01:01 +0800 > Subject: [PATCH] net/virtio: fix unchecked return value > > [ upstream commit ecfae1510edc1391285aa566a2d31e7eae8fc6d2 ] > > Coverity issue: 302861 > Fixes: 6ba1f63b5ab0 ("virtio: support specification 1.0") > > Signed-off-by: Tiwei Bie > Reviewed-by: Maxime Coquelin > --- > drivers/net/virtio/virtio_pci.c | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/virtio/virtio_pci.c b/drivers/net/virtio/virtio_pci.c > index 89986c335..249ec6d3a 100644 > --- a/drivers/net/virtio/virtio_pci.c > +++ b/drivers/net/virtio/virtio_pci.c > @@ -658,9 +658,15 @@ virtio_read_caps(struct rte_pci_device *dev, struct virtio_hw *hw) > hw->common_cfg = get_cfg_addr(dev, &cap); > break; > case VIRTIO_PCI_CAP_NOTIFY_CFG: > - rte_pci_read_config(dev, &hw->notify_off_multiplier, > + ret = rte_pci_read_config(dev, > + &hw->notify_off_multiplier, > 4, pos + sizeof(cap)); > - hw->notify_base = get_cfg_addr(dev, &cap); > + if (ret != 4) > + PMD_INIT_LOG(DEBUG, > + "failed to read notify_off_multiplier, ret %d", > + ret); > + else > + hw->notify_base = get_cfg_addr(dev, &cap); > break; > case VIRTIO_PCI_CAP_DEVICE_CFG: > hw->dev_cfg = get_cfg_addr(dev, &cap); > -- > 2.11.0 > > --- > Diff of the applied patch vs upstream commit (please double-check if non-empty: > --- > --- - 2018-11-29 15:01:49.832061811 -0800 > +++ 0106-net-virtio-fix-unchecked-return-value.patch 2018-11-29 15:01:45.278957000 -0800 > @@ -1,11 +1,12 @@ > -From ecfae1510edc1391285aa566a2d31e7eae8fc6d2 Mon Sep 17 00:00:00 2001 > +From 85fa65d2e2a0b9e0ac4baa0ff2c5f99bed5427ec Mon Sep 17 00:00:00 2001 > From: Tiwei Bie > Date: Wed, 7 Nov 2018 17:01:01 +0800 > Subject: [PATCH] net/virtio: fix unchecked return value > > +[ upstream commit ecfae1510edc1391285aa566a2d31e7eae8fc6d2 ] > + > Coverity issue: 302861 > Fixes: 6ba1f63b5ab0 ("virtio: support specification 1.0") > -Cc: stable@dpdk.org > > Signed-off-by: Tiwei Bie > Reviewed-by: Maxime Coquelin > @@ -14,10 +15,10 @@ > 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/virtio/virtio_pci.c b/drivers/net/virtio/virtio_pci.c > -index 21110cd69..c8883c32e 100644 > +index 89986c335..249ec6d3a 100644 > --- a/drivers/net/virtio/virtio_pci.c > +++ b/drivers/net/virtio/virtio_pci.c > -@@ -614,9 +614,15 @@ virtio_read_caps(struct rte_pci_device *dev, struct virtio_hw *hw) > +@@ -658,9 +658,15 @@ virtio_read_caps(struct rte_pci_device *dev, struct virtio_hw *hw) > hw->common_cfg = get_cfg_addr(dev, &cap); > break; > case VIRTIO_PCI_CAP_NOTIFY_CFG: