From owner-freebsd-ipfw@FreeBSD.ORG Fri Jan 5 20:40:26 2007 Return-Path: X-Original-To: freebsd-ipfw@hub.freebsd.org Delivered-To: freebsd-ipfw@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C1E7216A407 for ; Fri, 5 Jan 2007 20:40:26 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 9A02813C458 for ; Fri, 5 Jan 2007 20:40:26 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l05KeQ8k028114 for ; Fri, 5 Jan 2007 20:40:26 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l05KeQII028113; Fri, 5 Jan 2007 20:40:26 GMT (envelope-from gnats) Date: Fri, 5 Jan 2007 20:40:26 GMT Message-Id: <200701052040.l05KeQII028113@freefall.freebsd.org> To: freebsd-ipfw@FreeBSD.org From: "Anishchuk, Igor" Cc: Subject: Re: kern/107565: [ipfw] [patch] input string parsing mistake X-BeenThere: freebsd-ipfw@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "Anishchuk, Igor" List-Id: IPFW Technical Discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jan 2007 20:40:26 -0000 The following reply was made to PR kern/107565; it has been noted by GNATS. From: "Anishchuk, Igor" To: , "Anishchuk, Igor" Cc: Subject: Re: kern/107565: [ipfw] [patch] input string parsing mistake Date: Fri, 5 Jan 2007 22:36:40 +0200 Hello! I've found a little mistake in my workaround. The line for(ti=3D0; ti<16 && p[ti] !=3D 0; ti++){ should be for (ti=3D0; ti<16 && p && p[ti] !=3D 0; ti++){ Please change is ASAP otherwise segmentation fault will happen in some conditions. The complete, tested patch is: --- /usr/src/sbin/ipfw/ipfw2.c Fri Jan 5 17:43:25 2007 *************** *** 2720,2725 **** --- 2720,2733 ---- char *p =3D strpbrk(av, "/:,{"); int masklen; char md; + char t[15]; + int ti; + + for (ti=3D0; ti<16 && p && p[ti] !=3D 0; ti++){ + t[ti]=3Dp[ti+1]; + if(t[ti] !=3D '.' && (t[ti] < '0' || t[ti] > '9')) + t[ti] =3D '\0'; + } if (p) { md =3D *p; *************** *** 2731,2741 **** errx(EX_NOHOST, "hostname ``%s'' unknown", av); switch (md) { case ':': ! if (!inet_aton(p, (struct in_addr *)&d[1])) errx(EX_DATAERR, "bad netmask ``%s''", p); break; case '/': ! masklen =3D atoi(p); if (masklen =3D=3D 0) d[1] =3D htonl(0); /* mask */ else if (masklen > 32) --- 2739,2749 ---- errx(EX_NOHOST, "hostname ``%s'' unknown", av); switch (md) { case ':': ! if (!inet_aton(t, (struct in_addr *)&d[1])) errx(EX_DATAERR, "bad netmask ``%s''", p); break; case '/': ! masklen =3D atoi(t); if (masklen =3D=3D 0) d[1] =3D htonl(0); /* mask */ else if (masklen > 32) Thanks! --=20 Igor Anishchuk