[linux] 02/03: RDS: null pointer dereference in rds_atomic_free_op (CVE-2018-5333)

[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 6c0d6a6239bb0b6757a45bbd8e4779f113cff52b
Author: Salvatore Bonaccorso <carnil at debian.org>
Date:   Tue Jan 16 20:52:43 2018 +0100

    RDS: null pointer dereference in rds_atomic_free_op (CVE-2018-5333)
---
 debian/changelog                                   |  1 +
 ...pointer-dereference-in-rds_atomic_free_op.patch | 32 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 34 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9412c94..2f2a5cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 linux (4.14.13-2) UNRELEASED; urgency=medium
 
   * RDS: Heap OOB write in rds_message_alloc_sgs() (CVE-2018-5332)
+  * RDS: null pointer dereference in rds_atomic_free_op (CVE-2018-5333)
 
  -- Salvatore Bonaccorso <carnil at debian.org>  Tue, 16 Jan 2018 20:50:23 +0100
 
diff --git a/debian/patches/bugfix/all/RDS-null-pointer-dereference-in-rds_atomic_free_op.patch b/debian/patches/bugfix/all/RDS-null-pointer-dereference-in-rds_atomic_free_op.patch
new file mode 100644
index 0000000..4762042
--- /dev/null
+++ b/debian/patches/bugfix/all/RDS-null-pointer-dereference-in-rds_atomic_free_op.patch
@@ -0,0 +1,32 @@
+From: Mohamed Ghannam <simo.ghannam at gmail.com>
+Date: Wed, 3 Jan 2018 21:06:06 +0000
+Subject: RDS: null pointer dereference in rds_atomic_free_op
+Origin: https://git.kernel.org/linus/7d11f77f84b27cef452cee332f4e469503084737
+Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2018-5333
+
+set rm->atomic.op_active to 0 when rds_pin_pages() fails
+or the user supplied address is invalid,
+this prevents a NULL pointer usage in rds_atomic_free_op()
+
+Signed-off-by: Mohamed Ghannam <simo.ghannam at gmail.com>
+Acked-by: Santosh Shilimkar <santosh.shilimkar at oracle.com>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ net/rds/rdma.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/net/rds/rdma.c b/net/rds/rdma.c
+index 94729d9da437..634cfcb7bba6 100644
+--- a/net/rds/rdma.c
++++ b/net/rds/rdma.c
+@@ -877,6 +877,7 @@ int rds_cmsg_atomic(struct rds_sock *rs, struct rds_message *rm,
+ err:
+ 	if (page)
+ 		put_page(page);
++	rm->atomic.op_active = 0;
+ 	kfree(rm->atomic.op_notifier);
+ 
+ 	return ret;
+-- 
+2.15.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 0cae9fe..f502e75 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -132,6 +132,7 @@ bugfix/all/bpf-encapsulate-verifier-log-state-into-a-structure.patch
 bugfix/all/bpf-move-global-verifier-log-into-verifier-environme.patch
 bugfix/all/bpf-fix-integer-overflows.patch
 bugfix/all/RDS-Heap-OOB-write-in-rds_message_alloc_sgs.patch
+bugfix/all/RDS-null-pointer-dereference-in-rds_atomic_free_op.patch
 
 # Fix exported symbol versions
 bugfix/all/module-disable-matching-missing-version-crc.patch

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