UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ping: prevent NULL pointer dereference on write to msg_name 

A plain read() on a socket does set msg->msg_name to NULL. So check for
NULL pointer first.

Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Hannes Frederic Sowa 2013-11-18 07:07:45 +01:00 committed by David S. Miller
parent 4861292f73
commit cf970c002d
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
net/ipv4/ping.c
View File

@ -870,11 +870,13 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
if (family == AF_INET) { if (family == AF_INET) {
struct sockaddr_in *sin = (struct sockaddr_in *)msg->msg_name; struct sockaddr_in *sin = (struct sockaddr_in *)msg->msg_name;
sin->sin_family = AF_INET; if (sin) {
sin->sin_port = 0 /* skb->h.uh->source */; sin->sin_family = AF_INET;
sin->sin_addr.s_addr = ip_hdr(skb)->saddr; sin->sin_port = 0 /* skb->h.uh->source */;
memset(sin->sin_zero, 0, sizeof(sin->sin_zero)); sin->sin_addr.s_addr = ip_hdr(skb)->saddr;
*addr_len = sizeof(*sin); memset(sin->sin_zero, 0, sizeof(sin->sin_zero));
*addr_len = sizeof(*sin);
}
if (isk->cmsg_flags) if (isk->cmsg_flags)
ip_cmsg_recv(msg, skb); ip_cmsg_recv(msg, skb);
@ -886,16 +888,18 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
struct sockaddr_in6 *sin6 = struct sockaddr_in6 *sin6 =
(struct sockaddr_in6 *)msg->msg_name; (struct sockaddr_in6 *)msg->msg_name;
sin6->sin6_family = AF_INET6; if (sin6) {
sin6->sin6_port = 0; sin6->sin6_family = AF_INET6;
sin6->sin6_addr = ip6->saddr; sin6->sin6_port = 0;
sin6->sin6_flowinfo = 0; sin6->sin6_addr = ip6->saddr;
if (np->sndflow) sin6->sin6_flowinfo = 0;
sin6->sin6_flowinfo = ip6_flowinfo(ip6); if (np->sndflow)
sin6->sin6_flowinfo = ip6_flowinfo(ip6);
sin6->sin6_scope_id = ipv6_iface_scope_id(&sin6->sin6_addr, sin6->sin6_scope_id =
IP6CB(skb)->iif); ipv6_iface_scope_id(&sin6->sin6_addr,
*addr_len = sizeof(*sin6); IP6CB(skb)->iif);
*addr_len = sizeof(*sin6);
}
if (inet6_sk(sk)->rxopt.all) if (inet6_sk(sk)->rxopt.all)
pingv6_ops.ip6_datagram_recv_ctl(sk, msg, skb); pingv6_ops.ip6_datagram_recv_ctl(sk, msg, skb);