svn commit: r226186 - head/sys/netgraph

[Alexander V. Chernikov]

Author: melifaro
Date: Mon Oct 10 09:33:07 2011
New Revision: 226186
URL: http://svn.freebsd.org/changeset/base/226186

Log:
  Free mbuf in case when protocol in unknown in ng_ipfw_rcvdata().
  This change fixes (theoretically) possible mbuf leak introduced in
  r225586. Reorder code a bit and change return codes to be more specific
  
  Reviewed by:  glebius
  Approved by:    kib (mentor)

Modified:
  head/sys/netgraph/ng_ipfw.c

Modified: head/sys/netgraph/ng_ipfw.c
==============================================================================
--- head/sys/netgraph/ng_ipfw.c Mon Oct 10 09:13:07 2011        (r226185)
+++ head/sys/netgraph/ng_ipfw.c Mon Oct 10 09:33:07 2011        (r226186)
@@ -242,7 +242,7 @@ ng_ipfw_rcvdata(hook_p hook, item_p item
 
        if (m->m_len < sizeof(struct ip) &&
            (m = m_pullup(m, sizeof(struct ip))) == NULL)
-               return (EINVAL);
+               return (ENOBUFS);
 
        ip = mtod(m, struct ip *);
 
@@ -252,18 +252,14 @@ ng_ipfw_rcvdata(hook_p hook, item_p item
 #ifdef INET
                case IPVERSION:
                        ip_input(m);
-                       break;
+                       return (0);
 #endif
 #ifdef INET6
                case IPV6_VERSION >> 4:
                        ip6_input(m);
-                       break;
+                       return (0);
 #endif
-               default:
-                       NG_FREE_M(m);
-                       return (EINVAL);
                }
-               return (0);
        } else {
                switch (ip->ip_v) {
 #ifdef INET
@@ -277,10 +273,12 @@ ng_ipfw_rcvdata(hook_p hook, item_p item
                        return (ip6_output(m, NULL, NULL, 0, NULL,
                            NULL, NULL));
 #endif
-               default:
-                       return (EINVAL);
                }
        }
+
+       /* unknown IP protocol version */
+       NG_FREE_M(m);
+       return (EPROTONOSUPPORT);
 }
 
 static int
_______________________________________________
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-unsubscr...@freebsd.org"