CVS commit: [netbsd-5-0] src/sys/dist/ipf/netinet
Module Name:src Committed By: bouyer Date: Mon Jan 21 20:21:58 UTC 2013 Modified Files: src/sys/dist/ipf/netinet [netbsd-5-0]: ip_fil_netbsd.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1840): sys/external/bsd/ipf/netinet/ip_fil_netbsd.c: revision 1.4 via patch Fix off-by-one read error. To generate a diff of this commit: cvs rdiff -u -r1.46.8.1.2.1 -r1.46.8.1.2.2 \ src/sys/dist/ipf/netinet/ip_fil_netbsd.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/dist/ipf/netinet/ip_fil_netbsd.c diff -u src/sys/dist/ipf/netinet/ip_fil_netbsd.c:1.46.8.1.2.1 src/sys/dist/ipf/netinet/ip_fil_netbsd.c:1.46.8.1.2.2 --- src/sys/dist/ipf/netinet/ip_fil_netbsd.c:1.46.8.1.2.1 Mon May 11 20:03:08 2009 +++ src/sys/dist/ipf/netinet/ip_fil_netbsd.c Mon Jan 21 20:21:57 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_fil_netbsd.c,v 1.46.8.1.2.1 2009/05/11 20:03:08 bouyer Exp $ */ +/* $NetBSD: ip_fil_netbsd.c,v 1.46.8.1.2.2 2013/01/21 20:21:57 bouyer Exp $ */ /* * Copyright (C) 1993-2003 by Darren Reed. @@ -8,7 +8,7 @@ #if !defined(lint) #if defined(__NetBSD__) #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ip_fil_netbsd.c,v 1.46.8.1.2.1 2009/05/11 20:03:08 bouyer Exp $); +__KERNEL_RCSID(0, $NetBSD: ip_fil_netbsd.c,v 1.46.8.1.2.2 2013/01/21 20:21:57 bouyer Exp $); #else static const char sccsid[] = @(#)ip_fil.c 2.41 6/5/96 (C) 1993-2000 Darren Reed; static const char rcsid[] = @(#)Id: ip_fil_netbsd.c,v 2.55.2.59 2008/03/01 23:16:38 darrenr Exp; @@ -958,7 +958,7 @@ int dst; code = fin-fin_icode; #ifdef USE_INET6 - if ((code 0) || (code sizeof(icmptoicmp6unreach)/sizeof(int))) + if ((code 0) || (code = sizeof(icmptoicmp6unreach)/sizeof(int))) return -1; #endif
CVS commit: [netbsd-5-0] src/sys/dist/ipf/netinet
Module Name:src Committed By: bouyer Date: Mon May 11 20:03:08 UTC 2009 Modified Files: src/sys/dist/ipf/netinet [netbsd-5-0]: ip_fil_netbsd.c Log Message: Pull up following revision(s) (requested by kefren in ticket #748): sys/dist/ipf/netinet/ip_fil_netbsd.c: revision 1.50 Don't call callout_stop() without callout_init() Fixes PR/41364 To generate a diff of this commit: cvs rdiff -u -r1.46.8.1 -r1.46.8.1.2.1 \ src/sys/dist/ipf/netinet/ip_fil_netbsd.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/dist/ipf/netinet/ip_fil_netbsd.c diff -u src/sys/dist/ipf/netinet/ip_fil_netbsd.c:1.46.8.1 src/sys/dist/ipf/netinet/ip_fil_netbsd.c:1.46.8.1.2.1 --- src/sys/dist/ipf/netinet/ip_fil_netbsd.c:1.46.8.1 Thu Feb 19 20:33:39 2009 +++ src/sys/dist/ipf/netinet/ip_fil_netbsd.c Mon May 11 20:03:08 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_fil_netbsd.c,v 1.46.8.1 2009/02/19 20:33:39 snj Exp $ */ +/* $NetBSD: ip_fil_netbsd.c,v 1.46.8.1.2.1 2009/05/11 20:03:08 bouyer Exp $ */ /* * Copyright (C) 1993-2003 by Darren Reed. @@ -8,7 +8,7 @@ #if !defined(lint) #if defined(__NetBSD__) #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ip_fil_netbsd.c,v 1.46.8.1 2009/02/19 20:33:39 snj Exp $); +__KERNEL_RCSID(0, $NetBSD: ip_fil_netbsd.c,v 1.46.8.1.2.1 2009/05/11 20:03:08 bouyer Exp $); #else static const char sccsid[] = @(#)ip_fil.c 2.41 6/5/96 (C) 1993-2000 Darren Reed; static const char rcsid[] = @(#)Id: ip_fil_netbsd.c,v 2.55.2.59 2008/03/01 23:16:38 darrenr Exp; @@ -471,7 +471,8 @@ SPL_NET(s); #if (__NetBSD_Version__ = 10401) - callout_stop(fr_slowtimer_ch); + if (fr_running 0) + callout_stop(fr_slowtimer_ch); #else untimeout(fr_slowtimer, NULL); #endif /* NetBSD */
