Module Name: src
Committed By: martin
Date: Fri Aug 9 19:24:22 UTC 2019
Modified Files:
src/sys/external/bsd/ipf/netinet [netbsd-7]: fil.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #1701):
sys/external/bsd/ipf/netinet/fil.c: revision 1.30
PR/54443: Edgar Fu�: ipf mistakenly regards UDP packet with checksum field
0xffff as bad
To generate a diff of this commit:
cvs rdiff -u -r1.15.2.3 -r1.15.2.4 src/sys/external/bsd/ipf/netinet/fil.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/external/bsd/ipf/netinet/fil.c
diff -u src/sys/external/bsd/ipf/netinet/fil.c:1.15.2.3 src/sys/external/bsd/ipf/netinet/fil.c:1.15.2.4
--- src/sys/external/bsd/ipf/netinet/fil.c:1.15.2.3 Thu Jun 29 12:24:10 2017
+++ src/sys/external/bsd/ipf/netinet/fil.c Fri Aug 9 19:24:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: fil.c,v 1.15.2.3 2017/06/29 12:24:10 sborrill Exp $ */
+/* $NetBSD: fil.c,v 1.15.2.4 2019/08/09 19:24:22 martin Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -138,7 +138,7 @@ extern struct timeout ipf_slowtimer_ch;
#if !defined(lint)
#if defined(__NetBSD__)
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fil.c,v 1.15.2.3 2017/06/29 12:24:10 sborrill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fil.c,v 1.15.2.4 2019/08/09 19:24:22 martin Exp $");
#else
static const char sccsid[] = "@(#)fil.c 1.36 6/5/96 (C) 1993-2000 Darren Reed";
static const char rcsid[] = "@(#)Id: fil.c,v 1.1.1.2 2012/07/22 13:45:07 darrenr Exp $";
@@ -6474,8 +6474,11 @@ ipf_checkl4sum(fr_info_t *fin)
/*NOTREACHED*/
}
- if (csump != NULL)
+ if (csump != NULL) {
hdrsum = *csump;
+ if (fin->fin_p == IPPROTO_UDP && hdrsum == 0xffff)
+ hdrsum = 0x0000;
+ }
if (dosum) {
sum = fr_cksum(fin, fin->fin_ip, fin->fin_p, fin->fin_dp);
