kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ipv4: fix memory leaks in ip_cmsg_send() callers

Browse source 
Dmitry reported memory leaks of IP options allocated in
ip_cmsg_send() when/if this function returns an error.

Callers are responsible for the freeing.

Many thanks to Dmitry for the report and diagnostic.

Reported-by: Dmitry Vyukov <dvyukov@google.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2016-02-04 06:23:28 -08:00 committed by David S. Miller
parent c2bb7bc5c0
commit 919483096b
4 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/ipv4/ip_sockglue.c
View file

@ -249,6 +249,8 @@ int ip_cmsg_send(struct net *net, struct msghdr *msg, struct ipcm_cookie *ipc,
switch (cmsg->cmsg_type) { switch (cmsg->cmsg_type) {
case IP_RETOPTS: case IP_RETOPTS:
err = cmsg->cmsg_len - CMSG_ALIGN(sizeof(struct cmsghdr)); err = cmsg->cmsg_len - CMSG_ALIGN(sizeof(struct cmsghdr));
/* Our caller is responsible for freeing ipc->opt */
err = ip_options_get(net, &ipc->opt, CMSG_DATA(cmsg), err = ip_options_get(net, &ipc->opt, CMSG_DATA(cmsg),
err < 40 ? err : 40); err < 40 ? err : 40);
if (err) if (err)

4
net/ipv4/ping.c
View file

@ -746,8 +746,10 @@ static int ping_v4_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
if (msg->msg_controllen) { if (msg->msg_controllen) {
err = ip_cmsg_send(sock_net(sk), msg, &ipc, false); err = ip_cmsg_send(sock_net(sk), msg, &ipc, false);
if (err) if (unlikely(err)) {
kfree(ipc.opt);
return err; return err;
}
if (ipc.opt) if (ipc.opt)
free = 1; free = 1;
} }

4
net/ipv4/raw.c
View file

@ -547,8 +547,10 @@ static int raw_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
if (msg->msg_controllen) { if (msg->msg_controllen) {
err = ip_cmsg_send(net, msg, &ipc, false); err = ip_cmsg_send(net, msg, &ipc, false);
if (err) if (unlikely(err)) {
kfree(ipc.opt);
goto out; goto out;
}
if (ipc.opt) if (ipc.opt)
free = 1; free = 1;
} }

4
net/ipv4/udp.c
View file

@ -1048,8 +1048,10 @@ int udp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
if (msg->msg_controllen) { if (msg->msg_controllen) {
err = ip_cmsg_send(sock_net(sk), msg, &ipc, err = ip_cmsg_send(sock_net(sk), msg, &ipc,
sk->sk_family == AF_INET6); sk->sk_family == AF_INET6);
if (err) if (unlikely(err)) {
kfree(ipc.opt);
return err; return err;
}
if (ipc.opt) if (ipc.opt)
free = 1; free = 1;
connected = 0; connected = 0;