X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=net%2Fipv6%2Fipv6_sockglue.c;h=741cfcd96f88fe7a3694eb670e4fa91e4503175c;hb=1a1dc50442ef1a3e5ef938a8541466ac38d163a9;hp=ea33b26512c220aa376e8c5051217e3417bdec95;hpb=db6d8c7a4027b48d797b369a53f8470aaeed7063;p=linux-2.6-omap-h63xx.git

diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
index ea33b26512c..741cfcd96f8 100644
--- a/net/ipv6/ipv6_sockglue.c
+++ b/net/ipv6/ipv6_sockglue.c
@@ -346,6 +346,8 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,
 		 */
 		if (optlen == 0)
 			optval = NULL;
+		else if (optval == NULL)
+			goto e_inval;
 		else if (optlen < sizeof(struct ipv6_opt_hdr) ||
 			 optlen & 0x7 || optlen > 8 * 255)
 			goto e_inval;