Pull up following revision(s) (requested by christos in ticket #1331):
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
This commit is contained in:
parent
5360a235d9
commit
96fc676343
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: fil.c,v 1.20.4.2 2018/12/26 13:18:53 martin Exp $ */
|
||||
/* $NetBSD: fil.c,v 1.20.4.3 2019/08/09 19:21:04 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.20.4.2 2018/12/26 13:18:53 martin Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: fil.c,v 1.20.4.3 2019/08/09 19:21:04 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 $";
|
||||
|
@ -6527,8 +6527,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);
|
||||
|
|
Loading…
Reference in New Issue