ipv4: fix memory leaks in udp_sendmsg, ping_v4_sendmsg (1b97013b) · Commits · 戴 / test

Fix more memory leaks in ip_cmsg_send() callers. Part of them were fixed earlier in . * udp_sendmsg one was there since the beginning when linux sources were first added to git; * ping_v4_sendmsg one was copy/pasted in . Whenever return happens in udp_sendmsg() or ping_v4_sendmsg() IP options have to be freed if they were allocated previously. Add label so that future callers (if any) can use it instead of kfree() before return that is easy to forget. Fixes: (net: ipv4: add IPPROTO_ICMP socket kind) Signed-off-by:

Andrey Ignatov <rdna@fb.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

net/ipv4/ping.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -775,8 +775,10 @@ static int ping_v4_sendmsg(struct sock sk, struct msghdr msg, size_t len)
		ipc.addr = faddr = daddr;

		if (ipc.opt && ipc.opt->opt.srr) {
		if (!daddr)
		return -EINVAL;
		if (!daddr) {
		err = -EINVAL;
		goto out_free;
		}
		faddr = ipc.opt->opt.faddr;
		}
		tos = get_rttos(&ipc, inet);
		@@ -842,6 +844,7 @@ back_from_confirm:

		out:
		ip_rt_put(rt);
		out_free:
		if (free)
		kfree(ipc.opt);
		if (!err) {

net/ipv4/udp.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -952,8 +952,10 @@ int udp_sendmsg(struct sock sk, struct msghdr msg, size_t len)
		sock_tx_timestamp(sk, ipc.sockc.tsflags, &ipc.tx_flags);

		if (ipc.opt && ipc.opt->opt.srr) {
		if (!daddr)
		return -EINVAL;
		if (!daddr) {
		err = -EINVAL;
		goto out_free;
		}
		faddr = ipc.opt->opt.faddr;
		connected = 0;
		}
		@@ -1074,6 +1076,7 @@ do_append_data:

		out:
		ip_rt_put(rt);
		out_free:
		if (free)
		kfree(ipc.opt);
		if (!err)

Admin message