Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91948309 authored Feb 04, 2016 by Eric Dumazet Committed by David S. Miller Feb 13, 2016

ipv4: fix memory leaks in ip_cmsg_send() callers



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>

parent c2bb7bc5

net/ipv4/ip_sockglue.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -249,6 +249,8 @@ int ip_cmsg_send(struct net net, struct msghdr msg, struct ipcm_cookie *ipc,
		switch (cmsg->cmsg_type) {
		case IP_RETOPTS:
		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 < 40 ? err : 40);
		if (err)

net/ipv4/ping.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -746,8 +746,10 @@ static int ping_v4_sendmsg(struct sock sk, struct msghdr msg, size_t len)

		if (msg->msg_controllen) {
		err = ip_cmsg_send(sock_net(sk), msg, &ipc, false);
		if (err)
		if (unlikely(err)) {
		kfree(ipc.opt);
		return err;
		}
		if (ipc.opt)
		free = 1;
		}

net/ipv4/raw.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -547,8 +547,10 @@ static int raw_sendmsg(struct sock sk, struct msghdr msg, size_t len)

		if (msg->msg_controllen) {
		err = ip_cmsg_send(net, msg, &ipc, false);
		if (err)
		if (unlikely(err)) {
		kfree(ipc.opt);
		goto out;
		}
		if (ipc.opt)
		free = 1;
		}

net/ipv4/udp.c

+3 −1

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