[linux] 01/01: IB/rxe: Fix mem_check_range integer overflow (CVE-2016-8636)

[debian-kernel at lists.debian.org]

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

carnil pushed a commit to branch sid
in repository linux.

commit 4a1042f1a0abcc93e28630e7e0f51959772b7508
Author: Salvatore Bonaccorso <carnil at debian.org>
Date:   Wed Feb 15 11:17:30 2017 +0100

    IB/rxe: Fix mem_check_range integer overflow (CVE-2016-8636)
---
 debian/changelog                                   |  3 ++
 ...-rxe-Fix-mem_check_range-integer-overflow.patch | 38 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 42 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 892ed9c..40dd461 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -194,6 +194,9 @@ linux (4.9.9-1) UNRELEASED; urgency=medium
     series
   * [armel] ARM: orion5x: fix Makefile for linkstation-lschl.dtb
 
+  [ Salvatore Bonaccorso ]
+  * IB/rxe: Fix mem_check_range integer overflow (CVE-2016-8636)
+
  -- Ben Hutchings <ben at decadent.org.uk>  Fri, 27 Jan 2017 18:14:31 +0000
 
 linux (4.9.6-3) unstable; urgency=medium
diff --git a/debian/patches/bugfix/all/IB-rxe-Fix-mem_check_range-integer-overflow.patch b/debian/patches/bugfix/all/IB-rxe-Fix-mem_check_range-integer-overflow.patch
new file mode 100644
index 0000000..952a7a1
--- /dev/null
+++ b/debian/patches/bugfix/all/IB-rxe-Fix-mem_check_range-integer-overflow.patch
@@ -0,0 +1,38 @@
+From: Eyal Itkin <eyal.itkin at gmail.com>
+Date: Tue, 7 Feb 2017 16:45:19 +0300
+Subject: IB/rxe: Fix mem_check_range integer overflow
+Origin: https://git.kernel.org/linus/647bf3d8a8e5777319da92af672289b2a6c4dc66
+
+Update the range check to avoid integer-overflow in edge case.
+Resolves CVE 2016-8636.
+
+Signed-off-by: Eyal Itkin <eyal.itkin at gmail.com>
+Signed-off-by: Dan Carpenter <dan.carpenter at oracle.com>
+Reviewed-by: Leon Romanovsky <leonro at mellanox.com>
+Signed-off-by: Doug Ledford <dledford at redhat.com>
+---
+ drivers/infiniband/sw/rxe/rxe_mr.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/infiniband/sw/rxe/rxe_mr.c b/drivers/infiniband/sw/rxe/rxe_mr.c
+index d0faca294006..86a6585b847d 100644
+--- a/drivers/infiniband/sw/rxe/rxe_mr.c
++++ b/drivers/infiniband/sw/rxe/rxe_mr.c
+@@ -59,9 +59,11 @@ int mem_check_range(struct rxe_mem *mem, u64 iova, size_t length)
+ 
+ 	case RXE_MEM_TYPE_MR:
+ 	case RXE_MEM_TYPE_FMR:
+-		return ((iova < mem->iova) ||
+-			((iova + length) > (mem->iova + mem->length))) ?
+-			-EFAULT : 0;
++		if (iova < mem->iova ||
++		    length > mem->length ||
++		    iova > mem->iova + mem->length - length)
++			return -EFAULT;
++		return 0;
+ 
+ 	default:
+ 		return -EFAULT;
+-- 
+2.11.0
+
diff --git a/debian/patches/series b/debian/patches/series
index 1f72abd..a2a8e33 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -104,6 +104,7 @@ features/all/securelevel/arm64-add-kernel-config-option-to-set-securelevel-wh.pa
 
 # Security fixes
 debian/i386-686-pae-pci-set-pci-nobios-by-default.patch
+bugfix/all/IB-rxe-Fix-mem_check_range-integer-overflow.patch
 
 # Fix exported symbol versions
 bugfix/ia64/revert-ia64-move-exports-to-definitions.patch

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