releases/2.6.20.4/fix-another-null-pointer-deref-in-ipv6_sockglue.c.patch

From stable-bounces@linux.kernel.org Fri Mar  9 23:05:14 2007
From: Olaf Kirch <olaf.kirch@oracle.com>
Date: Fri, 09 Mar 2007 23:03:53 -0800 (PST)
Subject: Fix another NULL pointer deref in ipv6_sockglue.c
To: stable@kernel.org
Cc: bunk@stusta.de
Message-ID: <20070309.230353.71089669.davem@davemloft.net>

From: Olaf Kirch <olaf.kirch@oracle.com>

[IPV6]: Fix for ipv6_setsockopt NULL dereference

I came across this bug in http://bugzilla.kernel.org/show_bug.cgi?id=8155

Signed-off-by: Olaf Kirch <olaf.kirch@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
 net/ipv6/ipv6_sockglue.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/net/ipv6/ipv6_sockglue.c
+++ b/net/ipv6/ipv6_sockglue.c
@@ -414,7 +414,7 @@ static int do_ipv6_setsockopt(struct soc
 		}
 
 		/* routing header option needs extra check */
-		if (optname == IPV6_RTHDR && opt->srcrt) {
+		if (optname == IPV6_RTHDR && opt && opt->srcrt) {
 			struct ipv6_rt_hdr *rthdr = opt->srcrt;
 			switch (rthdr->type) {
 			case IPV6_SRCRT_TYPE_0: