summaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorGen Zhang <blackgod016574@gmail.com>2019-05-24 11:24:26 +0800
committerDavid S. Miller <davem@davemloft.net>2019-05-25 11:00:50 -0700
commit425aa0e1d01513437668fa3d4a971168bbaa8515 (patch)
tree40b79f75cb767fd303bb8314c1b067192e72d344 /net/ipv4
parent95baa60a0da80a0143e3ddd4d3725758b4513825 (diff)
downloadlinux-425aa0e1d01513437668fa3d4a971168bbaa8515.tar.gz
linux-425aa0e1d01513437668fa3d4a971168bbaa8515.tar.bz2
linux-425aa0e1d01513437668fa3d4a971168bbaa8515.zip
ip_sockglue: Fix missing-check bug in ip_ra_control()
In function ip_ra_control(), the pointer new_ra is allocated a memory space via kmalloc(). And it is used in the following codes. However, when there is a memory allocation error, kmalloc() fails. Thus null pointer dereference may happen. And it will cause the kernel to crash. Therefore, we should check the return value and handle the error. Signed-off-by: Gen Zhang <blackgod016574@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/ip_sockglue.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index 82f341e84fae..aa3fd61818c4 100644
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
@@ -343,6 +343,8 @@ int ip_ra_control(struct sock *sk, unsigned char on,
return -EINVAL;
new_ra = on ? kmalloc(sizeof(*new_ra), GFP_KERNEL) : NULL;
+ if (on && !new_ra)
+ return -ENOMEM;
mutex_lock(&net->ipv4.ra_mutex);
for (rap = &net->ipv4.ra_chain;