From owner-freebsd-bugs@FreeBSD.ORG Mon Oct 25 12:10:21 2004 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CE15616A54A for ; Mon, 25 Oct 2004 12:10:21 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9F54C43D5A for ; Mon, 25 Oct 2004 12:10:21 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.11/8.12.11) with ESMTP id i9PCALp5091346 for ; Mon, 25 Oct 2004 12:10:21 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i9PCALBs091345; Mon, 25 Oct 2004 12:10:21 GMT (envelope-from gnats) Resent-Date: Mon, 25 Oct 2004 12:10:21 GMT Resent-Message-Id: <200410251210.i9PCALBs091345@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Giorgos Keramidas Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A574A16A4CE for ; Mon, 25 Oct 2004 12:04:48 +0000 (GMT) Received: from kane.otenet.gr (kane.otenet.gr [195.170.0.27]) by mx1.FreeBSD.org (Postfix) with ESMTP id E821243D69 for ; Mon, 25 Oct 2004 12:04:47 +0000 (GMT) (envelope-from keramida@bytemobile.com) Received: from orion.daedalusnetworks.priv (aris.bedc.ondsl.gr [62.103.39.226])i9PC4iUP015459 for ; Mon, 25 Oct 2004 15:04:45 +0300 Received: from orion.daedalusnetworks.priv (orion [127.0.0.1]) i9PC4iGG003337 for ; Mon, 25 Oct 2004 15:04:44 +0300 (EEST) (envelope-from keramida@orion.daedalusnetworks.priv) Received: (from keramida@localhost)i9PC4iKl003336; Mon, 25 Oct 2004 15:04:44 +0300 (EEST) (envelope-from keramida) Message-Id: <200410251204.i9PC4iKl003336@orion.daedalusnetworks.priv> Date: Mon, 25 Oct 2004 15:04:44 +0300 (EEST) From: Giorgos Keramidas To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: bin/73112: change atol() to strtol() in badsect X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Giorgos Keramidas List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Oct 2004 12:10:22 -0000 >Number: 73112 >Category: bin >Synopsis: change atol() to strtol() in badsect >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Oct 25 12:10:21 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Giorgos Keramidas >Release: FreeBSD 6.0-CURRENT i386 >Organization: >Environment: System: FreeBSD orion.daedalusnetworks.priv 6.0-CURRENT FreeBSD 6.0-CURRENT #4: \ Fri Oct 22 17:12:12 EEST 2004 root@orion.daedalusnetworks.priv:/usr/obj/usr/src/sys/ORION i386 >Description: The badsect(8) utility uses atol(), which doesn't allow very good error checking and only recognizes numbers in base 10. The attached patch checks errno after strtol() and uses a base of 0 to allow octal, or hex sector numbers too. >How-To-Repeat: >Fix: --- badsect.patch begins here --- Index: badsect.c =================================================================== RCS file: /home/ncvs/src/sbin/badsect/badsect.c,v retrieving revision 1.20 diff -u -u -r1.20 badsect.c --- badsect.c 9 Apr 2004 19:58:25 -0000 1.20 +++ badsect.c 25 Oct 2004 12:00:37 -0000 @@ -59,6 +59,7 @@ #include #include +#include #include #include #include @@ -123,7 +124,9 @@ err(7, "%s", name); } for (argc -= 2, argv += 2; argc > 0; argc--, argv++) { - number = atol(*argv); + number = strtol(*argv, NULL, 0); + if (errno == EINVAL || errno == ERANGE) + err(8, "%s", *argv); if (chkuse(number, 1)) continue; /* --- badsect.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: