Module Name: src Committed By: ozaki-r Date: Thu Jun 30 06:48:58 UTC 2016
Modified Files: src/sys/netinet: ip_input.c Log Message: Fix error paths Some error paths did m_put_rcvif_psref twice. To generate a diff of this commit: cvs rdiff -u -r1.330 -r1.331 src/sys/netinet/ip_input.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/netinet/ip_input.c diff -u src/sys/netinet/ip_input.c:1.330 src/sys/netinet/ip_input.c:1.331 --- src/sys/netinet/ip_input.c:1.330 Tue Jun 28 02:02:56 2016 +++ src/sys/netinet/ip_input.c Thu Jun 30 06:48:58 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_input.c,v 1.330 2016/06/28 02:02:56 ozaki-r Exp $ */ +/* $NetBSD: ip_input.c,v 1.331 2016/06/30 06:48:58 ozaki-r Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -91,7 +91,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.330 2016/06/28 02:02:56 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.331 2016/06/30 06:48:58 ozaki-r Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -731,6 +731,7 @@ ip_input(struct mbuf *m) ours: m_put_rcvif_psref(ifp, &psref); + ifp = NULL; /* * If offset or IP_MF are set, must reassemble.