From nobody@FreeBSD.org  Mon Aug 31 11:23:19 2009
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AF1F51065672
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 31 Aug 2009 11:23:19 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 9E0B68FC1D
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 31 Aug 2009 11:23:19 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n7VBNJRM013610
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 31 Aug 2009 11:23:19 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id n7VBNJu1013609;
	Mon, 31 Aug 2009 11:23:19 GMT
	(envelope-from nobody)
Message-Id: <200908311123.n7VBNJu1013609@www.freebsd.org>
Date: Mon, 31 Aug 2009 11:23:19 GMT
From: Patroklos Argyroudis <argp@census-labs.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: NULL pointer dereference in gif_input() in file sys/net/if_gif.c
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         138390
>Category:       kern
>Synopsis:       [gif] [patch] NULL pointer dereference in gif_input() in file sys/net/if_gif.c
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    brueffer
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Aug 31 11:30:05 UTC 2009
>Closed-Date:    Mon Oct 10 20:21:13 CEST 2011
>Last-Modified:  Mon Oct 10 20:21:13 CEST 2011
>Originator:     Patroklos Argyroudis
>Release:        8.0-CURRENT
>Organization:
census, inc
>Environment:
N/A
>Description:
There is a possible NULL pointer dereference in gif_input() in file sys/net/if_gif.c at line 510.  The check against NULL at line 515 should be before the dereference of ifp at line 510.
>How-To-Repeat:
N/A
>Fix:
Patch attached.

Patch attached with submission follows:

--- ./sys/net/if_gif.c.orig	2009-08-28 16:49:31.000000000 +0300
+++ ./sys/net/if_gif.c	2009-08-28 16:50:59.000000000 +0300
@@ -507,7 +507,7 @@
 	struct ifnet *ifp;
 {
 	int isr, n;
-	struct gif_softc *sc = ifp->if_softc;
+	struct gif_softc *sc;
 	struct etherip_header *eip;
 	struct ether_header *eh;
 	struct ifnet *oldifp;
@@ -518,6 +518,7 @@
 		return;
 	}
 
+	sc = ifp->if_softc;
 	m->m_pkthdr.rcvif = ifp;
 
 #ifdef MAC


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->freebsd-net 
Responsible-Changed-By: gavin 
Responsible-Changed-When: Mon Aug 31 14:20:26 UTC 2009 
Responsible-Changed-Why:  
Over to maintainer(s) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=138390 
State-Changed-From-To: open->patched 
State-Changed-By: brueffer 
State-Changed-When: Thu Oct 22 08:17:12 CEST 2009 
State-Changed-Why:  
Committed, thanks! 


Responsible-Changed-From-To: freebsd-net->brueffer 
Responsible-Changed-By: brueffer 
Responsible-Changed-When: Thu Oct 22 08:17:12 CEST 2009 
Responsible-Changed-Why:  
MFC reminder. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=138390 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/138390: commit references a PR
Date: Thu, 22 Oct 2009 06:17:18 +0000 (UTC)

 Author: brueffer
 Date: Thu Oct 22 06:17:04 2009
 New Revision: 198357
 URL: http://svn.freebsd.org/changeset/base/198357
 
 Log:
   Check pointer for NULL before dereferencing it, not after.
   
   PR:		138390
   Submitted by:	Patroklos Argyroudis <argp@census-labs.com>
   MFC after:	1 week
 
 Modified:
   head/sys/net/if_gif.c
 
 Modified: head/sys/net/if_gif.c
 ==============================================================================
 --- head/sys/net/if_gif.c	Thu Oct 22 06:13:07 2009	(r198356)
 +++ head/sys/net/if_gif.c	Thu Oct 22 06:17:04 2009	(r198357)
 @@ -507,7 +507,7 @@ gif_input(m, af, ifp)
  	struct ifnet *ifp;
  {
  	int isr, n;
 -	struct gif_softc *sc = ifp->if_softc;
 +	struct gif_softc *sc;
  	struct etherip_header *eip;
  	struct ether_header *eh;
  	struct ifnet *oldifp;
 @@ -517,7 +517,7 @@ gif_input(m, af, ifp)
  		m_freem(m);
  		return;
  	}
 -
 +	sc = ifp->if_softc;
  	m->m_pkthdr.rcvif = ifp;
  
  #ifdef MAC
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: patched->closed 
State-Changed-By: brueffer 
State-Changed-When: Mon Oct 10 20:20:47 CEST 2011 
State-Changed-Why:  
MFCs done. Sorry for the long delay! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=138390 
>Unformatted:
