summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorMohamed Ghannam <simo.ghannam@gmail.com>2018-01-03 21:06:06 +0000
committerBen Hutchings <ben@decadent.org.uk>2018-02-13 18:42:31 +0000
commitc8b61a6ecfb90c7fb4f824df2448b923954de170 (patch)
tree3394f1310ae38e41ab10af6a7508ca89709f9ed8 /net
parenta64a21f6de4faf41b74800275be0552f55e83699 (diff)
RDS: null pointer dereference in rds_atomic_free_op
commit 7d11f77f84b27cef452cee332f4e469503084737 upstream. 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: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net')
-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 6bb8a4ca3b7a..6fcd65a923ea 100644
--- a/net/rds/rdma.c
+++ b/net/rds/rdma.c
@@ -855,6 +855,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;