From owner-freebsd-security Wed Nov 28 1: 6:19 2001 Delivered-To: freebsd-security@freebsd.org Received: from TYO201.gate.nec.co.jp (TYO201.gate.nec.co.jp [202.32.8.214]) by hub.freebsd.org (Postfix) with ESMTP id F05ED37B41C for ; Wed, 28 Nov 2001 01:06:05 -0800 (PST) Received: from mailgate4.nec.co.jp ([10.7.69.195]) by TYO201.gate.nec.co.jp (8.11.6/3.7W01080315) with ESMTP id fAS95GR16576; Wed, 28 Nov 2001 18:05:17 +0900 (JST) Received: from mailsv4.nec.co.jp (mailgate51.nec.co.jp [10.7.69.190]) by mailgate4.nec.co.jp (8.11.6/3.7W-MAILGATE-NEC) with ESMTP id fAS958a07642; Wed, 28 Nov 2001 18:05:09 +0900 (JST) Received: from siaew3.ksp.nis.nec.co.jp (siaew3.ksp.nis.nec.co.jp [10.57.25.208]) by mailsv4.nec.co.jp (8.11.6/3.7W-MAILSV4-NEC) with ESMTP id fAS94ji16277; Wed, 28 Nov 2001 18:05:01 +0900 (JST) Received: by siaew3.ksp.nis.nec.co.jp (8.11.5/kajino-07/01/01) id fAS952G13031; Wed, 28 Nov 2001 18:05:02 +0900 (JST) Message-Id: <200111280905.fAS952G13031@SIS.ksp.nis.nec.co.jp> To: "Andrey A. Chernov" Cc: Koga Youichirou , mike@sentex.net, freebsd-security@FreeBSD.ORG Subject: Re: wu-ftpd ? In-reply-to: Your message of "Wed, 28 Nov 2001 11:44:17 JST." <20011128084416.GA32507@nagual.pp.ru> User-Agent: EMH/1.14.1 SEMI/1.14.3 (Ushinoya) FLIM/1.14.3 (=?ISO-8859-4?Q?Unebigory=F2mae?=) APEL/10.3 Emacs/21.1 (sparc-sun-solaris2.8) MULE/5.0 (=?ISO-2022-JP?B?GyRCOC1MWhsoQg==?=) MIME-Version: 1.0 (generated by SEMI 1.14.3 - "Ushinoya") Content-Type: multipart/mixed; boundary="Multipart_Wed_Nov_28_18:05:02_2001-1" Date: Wed, 28 Nov 2001 18:05:02 +0900 From: =?ISO-2022-JP?B?IlMuS2FqaW5vLxskQjNhTG4/OBsoQiI=?= Sender: owner-freebsd-security@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org --Multipart_Wed_Nov_28_18:05:02_2001-1 Content-Type: text/plain; charset=US-ASCII >>In Article <20011128084416.GA32507@nagual.pp.ru> > "Andrey A. Chernov" writes: >> Following is RedHat's patch: ; >It seems that this patch is over another patch and not for original 2.6.1 >sources. Could you please provide cumulative patch compared to original >sources? That's as follows. //////////////////////////////////////////////////////////////// NEC informatec systems Co.,ltd. TEL 044-812-8418 Shared Infrastructure and Service Div., 2nd SP Group. kajino@nis.nec.co.jp (S.Kajino) --Multipart_Wed_Nov_28_18:05:02_2001-1 Content-Type: text/plain; charset=US-ASCII diff -Naur wu-ftpd-2.6.1.orig/src/glob.c wu-ftpd-2.6.1/src/glob.c --- wu-ftpd-2.6.1.orig/src/glob.c Sun Jul 2 03:17:39 2000 +++ wu-ftpd-2.6.1/src/glob.c Wed Nov 28 14:10:55 2001 @@ -298,7 +298,7 @@ for (lm = restbuf; *p != '{'; *lm++ = *p++) continue; - for (pe = ++p; *pe; pe++) + for (pe = ++p; *pe; pe++) { switch (*pe) { case '{': @@ -314,11 +314,19 @@ case '[': for (pe++; *pe && *pe != ']'; pe++) continue; + if (!*pe) { + globerr = "Missing ]"; + return (0); + } continue; } + } pend: - brclev = 0; - for (pl = pm = p; pm <= pe; pm++) + if (brclev || !*pe) { + globerr = "Missing }"; + return (0); + } + for (pl = pm = p; pm <= pe; pm++) { switch (*pm & (QUOTE | TRIM)) { case '{': @@ -352,19 +360,18 @@ return (1); sort(); pl = pm + 1; - if (brclev) - return (0); continue; case '[': for (pm++; *pm && *pm != ']'; pm++) continue; - if (!*pm) - pm--; + if (!*pm) { + globerr = "Missing ]"; + return (0); + } continue; } - if (brclev) - goto doit; + } return (0); } @@ -416,11 +423,10 @@ else if (scc == (lc = cc)) ok++; } - if (cc == 0) - if (ok) - p--; - else - return 0; + if (cc == 0) { + globerr = "Missing ]"; + return (0); + } continue; case '*': @@ -472,67 +478,6 @@ } } } - -/* This function appears to be unused, so why waste time and space on it? */ -#if 0 == 1 -static int Gmatch(register char *s, register char *p) -{ - register int scc; - int ok, lc; - int c, cc; - - for (;;) { - scc = *s++ & TRIM; - switch (c = *p++) { - - case '[': - ok = 0; - lc = 077777; - while (cc = *p++) { - if (cc == ']') { - if (ok) - break; - return (0); - } - if (cc == '-') { - if (lc <= scc && scc <= *p++) - ok++; - } - else if (scc == (lc = cc)) - ok++; - } - if (cc == 0) - if (ok) - p--; - else - return 0; - continue; - - case '*': - if (!*p) - return (1); - for (s--; *s; s++) - if (Gmatch(s, p)) - return (1); - return (0); - - case 0: - return (scc == 0); - - default: - if ((c & TRIM) != scc) - return (0); - continue; - - case '?': - if (scc == 0) - return (0); - continue; - - } - } -} -#endif /* Gmatch exclusion */ static void Gcat(register char *s1, register char *s2) { --Multipart_Wed_Nov_28_18:05:02_2001-1-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-security" in the body of the message