From: Denis V. Lunev Date: Wed, 4 Jun 2008 11:49:06 +0000 (+0400) Subject: [IPV6]: Do not change protocol for raw IPv6 sockets. X-Git-Tag: v2.6.26-rc5~1^2~12^2~2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=49d074f4009a7b5ce9c17b040f978abcb4d7f6f6;p=linux-2.6-omap-h63xx.git [IPV6]: Do not change protocol for raw IPv6 sockets. It is not allowed to change underlying protocol for int fd = socket(PF_INET6, SOCK_RAW, IPPROTO_UDP); Signed-off-by: Denis V. Lunev Signed-off-by: YOSHIFUJI Hideaki --- diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c index 3eef8e5b363..1afe210d628 100644 --- a/net/ipv6/ipv6_sockglue.c +++ b/net/ipv6/ipv6_sockglue.c @@ -161,6 +161,9 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname, struct ipv6_txoptions *opt; struct sk_buff *pktopt; + if (sk->sk_type == SOCK_RAW) + break; + if (sk->sk_protocol != IPPROTO_UDP && sk->sk_protocol != IPPROTO_UDPLITE && sk->sk_protocol != IPPROTO_TCP)