From owner-svn-src-all@freebsd.org Fri Dec 18 22:01:42 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0EECEA4B5C4 for ; Fri, 18 Dec 2015 22:01:42 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from mail-pa0-x232.google.com (mail-pa0-x232.google.com [IPv6:2607:f8b0:400e:c03::232]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CFEEE1E86 for ; Fri, 18 Dec 2015 22:01:41 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: by mail-pa0-x232.google.com with SMTP id ur14so66386298pab.0 for ; Fri, 18 Dec 2015 14:01:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=sender:subject:mime-version:content-type:from:in-reply-to:date:cc :message-id:references:to; bh=n9svhTMdl8iz4s0Bd5JDpBOjDbaDwgAhLkUYSlDDESs=; b=W3TKli4oTt+NRRWgDevraQsbkHjDcZJ1drw3AfLVVhjpzGa216Pt//T/hDXfEOoAui yzrWvIMANH0oPeRrjV6duY53pVxwW8F4UKg7bCVy6HvXVCYZqvxFP9vOHR1DBGPx0cc/ ea53BxTLR/33qvVImFDGvRdsjFi5v9lEPDR5f39Hwj5YZeM0XyS1C4T7YHvXye470JmZ ErmJKs01zNu+jSlSnjEYV73/GQ41EbPPUVeoLSq6MyNZaMCVFzzozvM1aGFTN3r595+c DqHEiBVV/cDIDkdPwAoS0Ca98uDpNE5jg2KE1PxECLckFgOcQ566ca4+7mCXIQ9zpfmL K4TA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:mime-version:content-type:from :in-reply-to:date:cc:message-id:references:to; bh=n9svhTMdl8iz4s0Bd5JDpBOjDbaDwgAhLkUYSlDDESs=; b=TJjiPQEg5m3vxUNnNXXS+L0bd+pp/i/EXPIXHEaajZb/wh7tiyI/zN6JY7+ZAYb2qP yLAdZCkjajjXp69hwwYdUFaxij2FbPB5GW2K8jsbpqNVnNXBBwNSZK9/ajhQBsUl+6md zleGECCINKvvxbE8tWPNjXgbFe6Nr/7MSN+8AMprkfTqV73vKVTkanCE1ww53Nu+mIO2 0jIv496p0dfB+svvJXr/r59pylPhQOhJtGwozul4o14VvbBN6HMAmj0Glk3kKpPGKFV+ 9rOQeSzR5HPeqSelJpClVYyvAo/JpsgydmquJaNHRa6305IRbK2oAIXBnX6HzrvIp6nP UYjw== X-Gm-Message-State: ALoCoQkxBKLCqXtioIx/uQyJmsZDdUvjykpYCUZQJcnwkNcfUpRpCtFbxZM0AyHSVo7rvYQmUVc+U4rFGjoW3OuXhsf7dfe5Pg== X-Received: by 10.66.118.135 with SMTP id km7mr8628005pab.159.1450476101484; Fri, 18 Dec 2015 14:01:41 -0800 (PST) Received: from [100.127.128.44] ([69.53.245.4]) by smtp.gmail.com with ESMTPSA id s90sm14723652pfi.72.2015.12.18.14.01.40 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 18 Dec 2015 14:01:40 -0800 (PST) Sender: Warner Losh Subject: Re: svn commit: r292454 - head/bin/ed Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2104\)) Content-Type: multipart/signed; boundary="Apple-Mail=_2ABCFC0F-4C08-4801-BFE5-1B8B17CD29D9"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Pgp-Agent: GPGMail 2.5.2 From: Warner Losh In-Reply-To: <201512182158.tBILwhRB040583@repo.freebsd.org> Date: Fri, 18 Dec 2015 15:01:38 -0700 Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-Id: <44E9BE06-1883-4AF8-816D-D699CF733EEB@bsdimp.com> References: <201512182158.tBILwhRB040583@repo.freebsd.org> To: "Pedro F. Giffuni" X-Mailer: Apple Mail (2.2104) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Dec 2015 22:01:42 -0000 --Apple-Mail=_2ABCFC0F-4C08-4801-BFE5-1B8B17CD29D9 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 Isn=E2=80=99t strlcpy() the more appropriate interface? strncpy = doesn=E2=80=99t guarantee NUL termination. Warner > On Dec 18, 2015, at 2:58 PM, Pedro F. Giffuni wrote: >=20 > Author: pfg > Date: Fri Dec 18 21:58:42 2015 > New Revision: 292454 > URL: https://svnweb.freebsd.org/changeset/base/292454 >=20 > Log: > ed(1): Prevent possible string overflows >=20 > CID: 1007252 > MFC after: 2 weeks >=20 > Modified: > head/bin/ed/main.c >=20 > Modified: head/bin/ed/main.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/bin/ed/main.c Fri Dec 18 21:34:28 2015 = (r292453) > +++ head/bin/ed/main.c Fri Dec 18 21:58:42 2015 = (r292454) > @@ -505,7 +505,8 @@ exec_command(void) > return ERR; > else if (open_sbuf() < 0) > return FATAL; > - if (*fnp && *fnp !=3D '!') strcpy(old_filename, fnp); > + if (*fnp && *fnp !=3D '!') > + strncpy(old_filename, fnp, PATH_MAX); > #ifdef BACKWARDS > if (*fnp =3D=3D '\0' && *old_filename =3D=3D '\0') { > errmsg =3D "no current filename"; > @@ -532,7 +533,8 @@ exec_command(void) > return ERR; > } > GET_COMMAND_SUFFIX(); > - if (*fnp) strcpy(old_filename, fnp); > + if (*fnp) > + strncpy(old_filename, fnp, PATH_MAX); > printf("%s\n", strip_escapes(old_filename)); > break; > case 'g': > @@ -663,7 +665,7 @@ exec_command(void) > GET_COMMAND_SUFFIX(); > if (!isglobal) clear_undo_stack(); > if (*old_filename =3D=3D '\0' && *fnp !=3D '!') > - strcpy(old_filename, fnp); > + strncpy(old_filename, fnp, PATH_MAX); > #ifdef BACKWARDS > if (*fnp =3D=3D '\0' && *old_filename =3D=3D '\0') { > errmsg =3D "no current filename"; > @@ -797,7 +799,7 @@ exec_command(void) > return ERR; > GET_COMMAND_SUFFIX(); > if (*old_filename =3D=3D '\0' && *fnp !=3D '!') > - strcpy(old_filename, fnp); > + strncpy(old_filename, fnp, PATH_MAX); > #ifdef BACKWARDS > if (*fnp =3D=3D '\0' && *old_filename =3D=3D '\0') { > errmsg =3D "no current filename"; >=20 --Apple-Mail=_2ABCFC0F-4C08-4801-BFE5-1B8B17CD29D9 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJWdIJCAAoJEGwc0Sh9sBEAApIQAMhqBCqdCLu17RXWsvLLsXZF u5AWMtSUoJBPkJmQrBf8Pl6CX+U4Qudy3atCj9N0yEAiLEwE3U9JBwqhMP3Tedsz +LDHx5uSqYLo9DSHMUeVze6gBn6eOEeLV2/s+5aUQGcWV1X32XT7XT6Zv5KsyX22 6JvJZmmJVWbspIf3EWb1eX92z4qnZxPFYN38OzhNT+69BbIt506sRXi0a/Q/lnYP tZoP+8EQ78ZLcEECcZZFOFOOKEf57vty0afRmlesjc809cwa8UgbD4XK6yhgDEjR BZMJ9sCKK9XbvDW3RRLdrg42v2nGilyoeCrc84+47hzK0hlY1bikcYcMLP8l/HoM 9W6h0YAaLNort46ANaLoXlP3MFpSf1D0lLv+YKWXNbjucXqKToVU82tL1lKvkT4Y 1kSZDP5yXuBHSTMhMAJjDJIt7mbcBJsph5U+AO0aMxAgMhZaYdN6Y3xE+rg0sj66 AFoQpINJ0RYJv1PqWzDvKQEuaLbETgzZVnyXyXSMxLFRwxoRaMT93NelWScNPLUl XVuZ++1vjLKKVrIdAoJlgkeY23O3ngHTfKrazJjTOky9LSgHjVinvfkZu2O0HmzZ JzB5eLgZMtAbgQXjbhTi5j77La/4yYwQpaBMhv+gL7wllvTzs191AwqQlcHTaxr2 /M5xNHuiUxR+1txV5eTC =U0cR -----END PGP SIGNATURE----- --Apple-Mail=_2ABCFC0F-4C08-4801-BFE5-1B8B17CD29D9--