diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-06-12 17:26:29 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-06-12 17:26:29 -0700 |
| commit | 9b9e6bfb5c461da95d02b26a73935da8bd45fa54 (patch) | |
| tree | b22c464f94b5b5cc6e505638217f6194d34403ba /net/ipv4 | |
| parent | d2e3abf121ec2f6cf2bcd42f85ce84b2faaac7c1 (diff) | |
| parent | 6307901dd8031a24e34585c3590f951cebd9dee2 (diff) | |
| download | qcom-msm-v3.10-9b9e6bfb5c461da95d02b26a73935da8bd45fa54.tar.gz | |
Merge "ping: prevent NULL pointer dereference on write to msg_name"
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/ping.c | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c index 3af1269b17a..7de57d6893f 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c @@ -876,10 +876,12 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, /* Copy the address and add cmsg data. */ if (family == AF_INET) { sin = (struct sockaddr_in *) msg->msg_name; - sin->sin_family = AF_INET; - sin->sin_port = 0 /* skb->h.uh->source */; - sin->sin_addr.s_addr = ip_hdr(skb)->saddr; - memset(sin->sin_zero, 0, sizeof(sin->sin_zero)); + if (sin) { + sin->sin_family = AF_INET; + sin->sin_port = 0 /* skb->h.uh->source */; + sin->sin_addr.s_addr = ip_hdr(skb)->saddr; + memset(sin->sin_zero, 0, sizeof(sin->sin_zero)); + } if (isk->cmsg_flags) ip_cmsg_recv(msg, skb); @@ -889,16 +891,18 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, struct ipv6_pinfo *np = inet6_sk(sk); struct ipv6hdr *ip6 = ipv6_hdr(skb); sin6 = (struct sockaddr_in6 *) msg->msg_name; - sin6->sin6_family = AF_INET6; - sin6->sin6_port = 0; - sin6->sin6_addr = ip6->saddr; + if (sin6) { + sin6->sin6_family = AF_INET6; + sin6->sin6_port = 0; + sin6->sin6_addr = ip6->saddr; - sin6->sin6_flowinfo = 0; - if (np->sndflow) - sin6->sin6_flowinfo = ip6_flowinfo(ip6); + sin6->sin6_flowinfo = 0; + if (np->sndflow) + sin6->sin6_flowinfo = ip6_flowinfo(ip6); - sin6->sin6_scope_id = ipv6_iface_scope_id(&sin6->sin6_addr, + sin6->sin6_scope_id = ipv6_iface_scope_id(&sin6->sin6_addr, IP6CB(skb)->iif); + } if (inet6_sk(sk)->rxopt.all) pingv6_ops.ip6_datagram_recv_ctl(sk, msg, skb); |