Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The change in 1.3 is incorrect - it checks for FI_OOW regardless of what 

type of data is stored in the rule (only a valid check for FR_T_IPF rules.)
This commit is contained in:
darrenr 2004-10-06 15:06:29 +00:00
parent 9876532d80
commit 328bd73105
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sys/dist/ipf/netinet/fil.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: fil.c,v 1.3 2004/10/03 12:21:13 jdolecek Exp $ */
/* $NetBSD: fil.c,v 1.4 2004/10/06 15:06:29 darrenr Exp $ */
/*
* Copyright (C) 1993-2003 by Darren Reed.
@ -135,7 +135,7 @@ struct file;
#if !defined(lint)
#if defined(__NetBSD__)
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: fil.c,v 1.3 2004/10/03 12:21:13 jdolecek Exp $");
__KERNEL_RCSID(0, "$NetBSD: fil.c,v 1.4 2004/10/06 15:06:29 darrenr 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 2.243.2.25 2004/06/30 11:26:08 darrenr Exp";
@ -4006,15 +4006,6 @@ caddr_t data;
return EINVAL;
}
/*
* Allowing a rule with both "keep state" and "with oow" is
* pointless because adding a state entry to the table will
* fail with the out of window (oow) flag set.
*/
if ((fp->fr_flags & FR_KEEPSTATE)
&& fp->fr_dun.fru_ipf != NULL && (fp->fr_flx & FI_OOW))
return EINVAL;
/*
* If the rule is being loaded from user space, i.e. we had to copy it
* into kernel space, then do not trust the function pointer in the
@ -4124,8 +4115,17 @@ caddr_t data;
break;
#endif
case FR_T_IPF :
if (fp->fr_dsize == 0)
if (fp->fr_dsize != sizeof(fripf_t))
return EINVAL;
/*
* Allowing a rule with both "keep state" and "with oow" is
* pointless because adding a state entry to the table will
* fail with the out of window (oow) flag set.
*/
if ((fp->fr_flags & FR_KEEPSTATE) && (fp->fr_flx & FI_OOW))
return EINVAL;
switch (fp->fr_satype)
{
case FRI_BROADCAST :