From owner-svn-src-all@FreeBSD.ORG Sun Nov 9 13:20:32 2008 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C9A7D106564A; Sun, 9 Nov 2008 13:20:32 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from mail.terabit.net.ua (mail.terabit.net.ua [195.137.202.147]) by mx1.freebsd.org (Postfix) with ESMTP id 649E28FC08; Sun, 9 Nov 2008 13:20:32 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from skuns.zoral.com.ua ([91.193.166.194] helo=mail.zoral.com.ua) by mail.terabit.net.ua with esmtps (TLSv1:AES256-SHA:256) (Exim 4.63 (FreeBSD)) (envelope-from ) id 1KzADO-000N4G-FL; Sun, 09 Nov 2008 15:20:30 +0200 Received: from deviant.kiev.zoral.com.ua (root@deviant.kiev.zoral.com.ua [10.1.1.148]) by mail.zoral.com.ua (8.14.2/8.14.2) with ESMTP id mA9DKRXC049500 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 9 Nov 2008 15:20:28 +0200 (EET) (envelope-from kostikbel@gmail.com) Received: from deviant.kiev.zoral.com.ua (kostik@localhost [127.0.0.1]) by deviant.kiev.zoral.com.ua (8.14.3/8.14.3) with ESMTP id mA9DKR1E072063; Sun, 9 Nov 2008 15:20:27 +0200 (EET) (envelope-from kostikbel@gmail.com) Received: (from kostik@localhost) by deviant.kiev.zoral.com.ua (8.14.3/8.14.3/Submit) id mA9DKRim072061; Sun, 9 Nov 2008 15:20:27 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: deviant.kiev.zoral.com.ua: kostik set sender to kostikbel@gmail.com using -f Date: Sun, 9 Nov 2008 15:20:26 +0200 From: Kostik Belousov To: Matteo Riondato Message-ID: <20081109132026.GL18100@deviant.kiev.zoral.com.ua> References: <200811090644.mA96ira1032670@svn.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="EyugWz6C5819Q3pC" Content-Disposition: inline In-Reply-To: <200811090644.mA96ira1032670@svn.freebsd.org> User-Agent: Mutt/1.4.2.3i X-Virus-Scanned: ClamAV version 0.93.3, clamav-milter version 0.93.3 on skuns.kiev.zoral.com.ua X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on skuns.kiev.zoral.com.ua X-Virus-Scanned: mail.terabit.net.ua 1KzADO-000N4G-FL 5b74bafc673dcc8b9e2e65ee58c8fae9 X-Terabit: YES Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r184779 - head/usr.sbin/cron/crontab X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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: Sun, 09 Nov 2008 13:20:32 -0000 --EyugWz6C5819Q3pC Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Nov 09, 2008 at 06:44:53AM +0000, Matteo Riondato wrote: > Author: matteo > Date: Sun Nov 9 06:44:53 2008 > New Revision: 184779 > URL: http://svn.freebsd.org/changeset/base/184779 >=20 > Log: > Be paranoid and use snprintf > =20 > PR: bin/122137 > Submitted by: Steven Kreuzer > MFC after: 3 days >=20 > Modified: > head/usr.sbin/cron/crontab/crontab.c >=20 > Modified: head/usr.sbin/cron/crontab/crontab.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/usr.sbin/cron/crontab/crontab.c Sun Nov 9 01:53:06 2008 (r18477= 8) > +++ head/usr.sbin/cron/crontab/crontab.c Sun Nov 9 06:44:53 2008 (r18477= 9) > @@ -263,7 +263,7 @@ list_cmd() { > FILE *f; > =20 > log_it(RealUser, Pid, "LIST", User); > - (void) sprintf(n, CRON_TAB(User)); > + (void) snprintf(n, sizeof(n), CRON_TAB(User)); This note is probably also about paranoia instead of exploitable bug. I think that it is better to use %s format explicitely instead of expecting no '%' in the CRON_TAB(User). > if (!(f =3D fopen(n, "r"))) { > if (errno =3D=3D ENOENT) > errx(ERROR_EXIT, "no crontab for %s", User); > @@ -293,7 +293,7 @@ delete_cmd() { > } > =20 > log_it(RealUser, Pid, "DELETE", User); > - (void) sprintf(n, CRON_TAB(User)); > + (void) snprintf(n, sizeof(n), CRON_TAB(User)); > if (unlink(n)) { > if (errno =3D=3D ENOENT) > errx(ERROR_EXIT, "no crontab for %s", User); > @@ -327,7 +327,7 @@ edit_cmd() { > char new_md5[MD5_SIZE]; > =20 > log_it(RealUser, Pid, "BEGIN EDIT", User); > - (void) sprintf(n, CRON_TAB(User)); > + (void) snprintf(n, sizeof(n), CRON_TAB(User)); > if (!(f =3D fopen(n, "r"))) { > if (errno !=3D ENOENT) > err(ERROR_EXIT, "%s", n); > @@ -337,7 +337,7 @@ edit_cmd() { > } > =20 > um =3D umask(077); > - (void) sprintf(Filename, "/tmp/crontab.XXXXXXXXXX"); > + (void) snprintf(Filename, sizeof(Filename), "/tmp/crontab.XXXXXXXXXX"); > if ((t =3D mkstemp(Filename)) =3D=3D -1) { > warn("%s", Filename); > (void) umask(um); > @@ -504,8 +504,8 @@ replace_cmd() { > return (-2); > } > =20 > - (void) sprintf(n, "tmp.%d", Pid); > - (void) sprintf(tn, CRON_TAB(n)); > + (void) snprintf(n, sizeof(n), "tmp.%d", Pid); > + (void) snprintf(tn, sizeof(n), CRON_TAB(n)); > if (!(tmp =3D fopen(tn, "w+"))) { > warn("%s", tn); > return (-2); > @@ -592,7 +592,7 @@ replace_cmd() { > return (-2); > } > =20 > - (void) sprintf(n, CRON_TAB(User)); > + (void) snprintf(n, sizeof(n), CRON_TAB(User)); > if (rename(tn, n)) { > warn("error renaming %s to %s", tn, n); > unlink(tn); --EyugWz6C5819Q3pC Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (FreeBSD) iEYEARECAAYFAkkW45oACgkQC3+MBN1Mb4gfYQCg5TMAnQ+cJEhlagqffYeSSLn9 qyMAn1eJYaBBWg8z9rIKQqOkyk0sxfBk =XRk+ -----END PGP SIGNATURE----- --EyugWz6C5819Q3pC--