Commit f23d60de authored Jun 12, 2008 by David S. Miller

ipv6: Fix duplicate initialization of rawv6_prot.destroy



In changeset 22dd4850
("raw: Raw socket leak.") code was added so that we
flush pending frames on raw sockets to avoid leaks.

The ipv4 part was fine, but the ipv6 part was not
done correctly.  Unlike the ipv4 side, the ipv6 code
already has a .destroy method for rawv6_prot.

So now there were two assignments to this member, and
what the compiler does is use the last one, effectively
making the ipv6 parts of that changeset a NOP.

Fix this by removing the:

	.destroy	   = inet6_destroy_sock,

line, and adding an inet6_destroy_sock() call to the
end of raw6_destroy().

Noticed by Al Viro.

Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>

parent 24e3fcef

net/ipv6/raw.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1169,7 +1169,8 @@ static int raw6_destroy(struct sock *sk)
	lock_sock(sk);		lock_sock(sk);
	ip6_flush_pending_frames(sk);		ip6_flush_pending_frames(sk);
	release_sock(sk);		release_sock(sk);
	return 0;
			return inet6_destroy_sock(sk);
	}		}

	static int rawv6_init_sk(struct sock *sk)		static int rawv6_init_sk(struct sock *sk)
	@@ -1200,7 +1201,6 @@ struct proto rawv6_prot = {
	.disconnect = udp_disconnect,		.disconnect = udp_disconnect,
	.ioctl = rawv6_ioctl,		.ioctl = rawv6_ioctl,
	.init = rawv6_init_sk,		.init = rawv6_init_sk,
	.destroy = inet6_destroy_sock,
	.setsockopt = rawv6_setsockopt,		.setsockopt = rawv6_setsockopt,
	.getsockopt = rawv6_getsockopt,		.getsockopt = rawv6_getsockopt,
	.sendmsg = rawv6_sendmsg,		.sendmsg = rawv6_sendmsg,

Admin message