4.16-stable patches

added patches:
	net-aquantia-fix-unsigned-numvecs-comparison-with-less-than-zero.patch

diff --git a/queue-4.16/net-aquantia-fix-unsigned-numvecs-comparison-with-less-than-zero.patch b/queue-4.16/net-aquantia-fix-unsigned-numvecs-comparison-with-less-than-zero.patch
new file mode 100644 (file)
index 0000000..a0e56f6
--- /dev/null
+++ b/queue-4.16/net-aquantia-fix-unsigned-numvecs-comparison-with-less-than-zero.patch
@@ -0,0 +1,51 @@
+From 58d813afbe89658a5972747460a5fe19dec4dbcb Mon Sep 17 00:00:00 2001
+From: Colin Ian King <colin.king@canonical.com>
+Date: Thu, 7 Jun 2018 17:54:37 -0400
+Subject: net: aquantia: fix unsigned numvecs comparison with less than zero
+
+From: Colin Ian King <colin.king@canonical.com>
+
+commit 58d813afbe89658a5972747460a5fe19dec4dbcb upstream.
+
+This was originally mistakenly submitted to net-next. Resubmitting to net.
+
+The comparison of numvecs < 0 is always false because numvecs is a u32
+and hence the error return from a failed call to pci_alloc_irq_vectores
+is never detected.  Fix this by using the signed int ret to handle the
+error return and assign numvecs to err.
+
+Detected by CoverityScan, CID#1468650 ("Unsigned compared against 0")
+
+Fixes: a09bd81b5413 ("net: aquantia: Limit number of vectors to actually allocated irqs")
+Signed-off-by: Colin Ian King <colin.king@canonical.com>
+Signed-off-by: Igor Russkikh <igor.russkikh@aquantia.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Cc: Holger Hoffstätte <holger@applied-asynchrony.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c |   11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+--- a/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c
++++ b/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c
+@@ -267,14 +267,13 @@ static int aq_pci_probe(struct pci_dev *
+       numvecs = min(numvecs, num_online_cpus());
+       /*enable interrupts */
+ #if !AQ_CFG_FORCE_LEGACY_INT
+-      numvecs = pci_alloc_irq_vectors(self->pdev, 1, numvecs,
+-                                      PCI_IRQ_MSIX | PCI_IRQ_MSI |
+-                                      PCI_IRQ_LEGACY);
++      err = pci_alloc_irq_vectors(self->pdev, 1, numvecs,
++                                  PCI_IRQ_MSIX | PCI_IRQ_MSI |
++                                  PCI_IRQ_LEGACY);
+ 
+-      if (numvecs < 0) {
+-              err = numvecs;
++      if (err < 0)
+               goto err_hwinit;
+-      }
++      numvecs = err;
+ #endif
+       self->irqvecs = numvecs;
+ 

diff --git a/queue-4.16/series b/queue-4.16/series
index feab77a68fef6d357c766ba3755311d14178aa85..1edafb72e32854fd1c05776d1bc807b7a073d065 100644 (file)
--- a/queue-4.16/series
+++ b/queue-4.16/series
@@ -199,6 +199,7 @@ mac80211-use-timeout-from-the-addba-response-instead-of-the-request.patch
 x86-xen-reset-vcpu0-info-pointer-after-shared_info-remap.patch
 net-aquantia-driver-should-correctly-declare-vlan_features-bits.patch
 net-aquantia-limit-number-of-vectors-to-actually-allocated-irqs.patch
+net-aquantia-fix-unsigned-numvecs-comparison-with-less-than-zero.patch
 powerpc-pseries-fix-config_numa-n-build.patch
 can-dev-increase-bus-off-message-severity.patch
 hid-i2c-hid-add-resend_report_descr-quirk-for-toshiba-click-mini-l9w-b.patch