[linux] 02/02: iw_cxgb3: Fix incorrectly returning error on success (CVE-2015-8812)

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch jessie-security
in repository linux.

commit 9cbcc9ec552face4f35c95192e3d82f607a5969d
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Fri Feb 12 23:27:15 2016 +0000

    iw_cxgb3: Fix incorrectly returning error on success (CVE-2015-8812)
---
 debian/changelog                                   |  1 +
 ...ix-incorrectly-returning-error-on-success.patch | 38 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 40 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 391ee8f..a6a9740 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ linux (3.16.7-ckt20-1+deb8u4) UNRELEASED; urgency=medium
     (CVE-2016-2069)
   * [x86] mm: Improve switch_mm() barrier comments
   * pipe: limit the per-user amount of pages allocated in pipes (CVE-2013-4312)
+  * iw_cxgb3: Fix incorrectly returning error on success (CVE-2015-8812)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 23 Jan 2016 22:53:58 +0000
 
diff --git a/debian/patches/bugfix/all/iw_cxgb3-Fix-incorrectly-returning-error-on-success.patch b/debian/patches/bugfix/all/iw_cxgb3-Fix-incorrectly-returning-error-on-success.patch
new file mode 100644
index 0000000..002fb60
--- /dev/null
+++ b/debian/patches/bugfix/all/iw_cxgb3-Fix-incorrectly-returning-error-on-success.patch
@@ -0,0 +1,38 @@
+From: Hariprasad S <hariprasad at chelsio.com>
+Date: Fri, 11 Dec 2015 13:59:17 +0530
+Subject: iw_cxgb3: Fix incorrectly returning error on success
+Origin: https://git.kernel.org/linus/67f1aee6f45059fd6b0f5b0ecb2c97ad0451f6b3
+
+The cxgb3_*_send() functions return NET_XMIT_ values, which are
+positive integers values. So don't treat positive return values
+as an error.
+
+Signed-off-by: Steve Wise <swise at opengridcomputing.com>
+Signed-off-by: Hariprasad Shenai <hariprasad at chelsio.com>
+Signed-off-by: Doug Ledford <dledford at redhat.com>
+---
+ drivers/infiniband/hw/cxgb3/iwch_cm.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/infiniband/hw/cxgb3/iwch_cm.c b/drivers/infiniband/hw/cxgb3/iwch_cm.c
+index cb78b1e9bcd9..f504ba73e5dc 100644
+--- a/drivers/infiniband/hw/cxgb3/iwch_cm.c
++++ b/drivers/infiniband/hw/cxgb3/iwch_cm.c
+@@ -149,7 +149,7 @@ static int iwch_l2t_send(struct t3cdev *tdev, struct sk_buff *skb, struct l2t_en
+ 	error = l2t_send(tdev, skb, l2e);
+ 	if (error < 0)
+ 		kfree_skb(skb);
+-	return error;
++	return error < 0 ? error : 0;
+ }
+ 
+ int iwch_cxgb3_ofld_send(struct t3cdev *tdev, struct sk_buff *skb)
+@@ -165,7 +165,7 @@ int iwch_cxgb3_ofld_send(struct t3cdev *tdev, struct sk_buff *skb)
+ 	error = cxgb3_ofld_send(tdev, skb);
+ 	if (error < 0)
+ 		kfree_skb(skb);
+-	return error;
++	return error < 0 ? error : 0;
+ }
+ 
+ static void release_tid(struct t3cdev *tdev, u32 hwtid, struct sk_buff *skb)
diff --git a/debian/patches/series b/debian/patches/series
index ca74d64..015d5f4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -682,3 +682,4 @@ bugfix/all/aufs-tiny-extract-a-new-func-xino_fwrite_wkq.patch
 bugfix/all/aufs-for-4.3-xino-handles-eintr-from-the-dying-proce.patch
 bugfix/x86/x86-mm-Add-barriers-and-document-switch_mm-vs-flush-.patch
 bugfix/x86/x86-mm-Improve-switch_mm-barrier-comments.patch
+bugfix/all/iw_cxgb3-Fix-incorrectly-returning-error-on-success.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git