[src/netbsd-2-0]: src/dist/ipf/tools Pull up revision 1.5 (requested by chris...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d9969ca9a9ab
branches:  netbsd-2-0
changeset: 561215:d9969ca9a9ab
user:      tron <tron%NetBSD.org@localhost>
date:      Sun May 30 11:26:52 2004 +0000

description:
Pull up revision 1.5 (requested by christos in ticket #416):
PR/25532: Geoff C. Wing: a bad icmp-type rule in /etc/ipf.conf can cause ipf
to segv upon parsing.

diffstat:

 dist/ipf/tools/ipf_y.y |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (31 lines):

diff -r e1f39c88c58a -r d9969ca9a9ab dist/ipf/tools/ipf_y.y
--- a/dist/ipf/tools/ipf_y.y    Sun May 30 11:26:36 2004 +0000
+++ b/dist/ipf/tools/ipf_y.y    Sun May 30 11:26:52 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ipf_y.y,v 1.1.1.1.2.3 2004/05/30 11:21:36 tron Exp $   */
+/*     $NetBSD: ipf_y.y,v 1.1.1.1.2.4 2004/05/30 11:26:52 tron Exp $   */
 
 %{
 #include "ipf.h"
@@ -315,6 +315,9 @@
 settos:        IPFY_TOS                        { setipftype(); }
        ;
 
+seticmptype: IPFY_ICMPTYPE             { setipftype(); }
+       ;
+
 toslist:
        YY_NUMBER       { DOALL(fr->fr_tos = $1; fr->fr_mtos = 0xff;) }
        | YY_HEX        { DOREM(fr->fr_tos = $1; fr->fr_mtos = 0xff;) }
@@ -897,9 +900,9 @@
 icmp:  | itype icode
        ;
 
-itype: IPFY_ICMPTYPE icmptype
+itype: seticmptype icmptype
        { DOALL(fr->fr_icmp = htons($2 << 8); fr->fr_icmpm = htons(0xff00);) }
-       | IPFY_ICMPTYPE lstart typelist lend
+       | seticmptype lstart typelist lend
        ;
 
 icode: | IPFY_ICMPCODE icmpcode