Fix for ipv6_setsockopt NULL dereference

Fix for ipv6_setsockopt NULL dereference

[Olaf Kirch]

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

Here's a potential fix.

Olaf
-- 
Olaf Kirch  |  --- o --- Nous sommes du soleil we love when we play
okir@lst.de |    / | \   sol.dhoop.naytheet.ah kin.ir.samse.qurax
--
Fix NULL pointer derefence in ipv6_setsockopt, as described in bug #8155.

Signed-off-by: olaf.kirch@oracle.com

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

Index: build-2.6/net/ipv6/ipv6_sockglue.c
===================================================================
--- build-2.6.orig/net/ipv6/ipv6_sockglue.c
+++ build-2.6/net/ipv6/ipv6_sockglue.c
@@ -413,7 +413,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:

Re: Fix for ipv6_setsockopt NULL dereference

[YOSHIFUJI Hideaki / 吉藤英明]

In article <200703091515.55985.olaf.kirch@oracle.com> (at Fri, 9 Mar 2007 15:15:54 +0100), Olaf Kirch <olaf.kirch@oracle.com> says:

> I came across this bug in http://bugzilla.kernel.org/show_bug.cgi?id=8155
:
> Fix NULL pointer derefence in ipv6_setsockopt, as described in bug #8155.
> 
> Signed-off-by: olaf.kirch@oracle.com

Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>

I also ack to push this to -stable.

--yoshfuji

Re: Fix for ipv6_setsockopt NULL dereference

[David Miller]

From: YOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org>
Date: Fri, 09 Mar 2007 23:40:25 +0900 (JST)

> In article <200703091515.55985.olaf.kirch@oracle.com> (at Fri, 9 Mar 2007 15:15:54 +0100), Olaf Kirch <olaf.kirch@oracle.com> says:
> 
> > I came across this bug in http://bugzilla.kernel.org/show_bug.cgi?id=8155
> :
> > Fix NULL pointer derefence in ipv6_setsockopt, as described in bug #8155.
> > 
> > Signed-off-by: olaf.kirch@oracle.com
> 
> Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
> 
> I also ack to push this to -stable.

Thank you for reviewing.

Re: Fix for ipv6_setsockopt NULL dereference

[David Miller]

From: Olaf Kirch <olaf.kirch@oracle.com>
Date: Fri, 9 Mar 2007 15:15:54 +0100

> I came across this bug in http://bugzilla.kernel.org/show_bug.cgi?id=8155
> 
> Here's a potential fix.
> 
> Olaf
> -- 
> Olaf Kirch  |  --- o --- Nous sommes du soleil we love when we play
> okir@lst.de |    / | \   sol.dhoop.naytheet.ah kin.ir.samse.qurax
> --
> Fix NULL pointer derefence in ipv6_setsockopt, as described in bug #8155.
> 
> Signed-off-by: olaf.kirch@oracle.com

Applied, thanks a lot Olaf.

I'll push this to -stable too.