summaryrefslogtreecommitdiff
path: root/net/rds
diff options
context:
space:
mode:
authorMohamed Ghannam <simo.ghannam@gmail.com>2018-01-04 00:06:06 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-01-17 11:29:30 +0300
commit3396f2bef5ede06f73c0be43975ce837767785ed (patch)
treec175130f7d94bea2a26b61440cdf7af2ad8f7fcc /net/rds
parenta7b25c9f6ea92d582bda195eca561b9cb605ea91 (diff)
downloadlinux-3396f2bef5ede06f73c0be43975ce837767785ed.tar.xz
RDS: null pointer dereference in rds_atomic_free_op
[ Upstream commit 7d11f77f84b27cef452cee332f4e469503084737 ] 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@gmail.com> Acked-by: Santosh Shilimkar <santosh.shilimkar@oracle.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/rds')
-rw-r--r--net/rds/rdma.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/rds/rdma.c b/net/rds/rdma.c
index 3e6b133c5e96..b1ec96bca937 100644
--- a/net/rds/rdma.c
+++ b/net/rds/rdma.c
@@ -866,6 +866,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;