From owner-freebsd-fs@FreeBSD.ORG Tue May 24 16:08:51 2011 Return-Path: Delivered-To: freebsd-fs@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5E7BC106566B for ; Tue, 24 May 2011 16:08:51 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-yi0-f54.google.com (mail-yi0-f54.google.com [209.85.218.54]) by mx1.freebsd.org (Postfix) with ESMTP id 1D21F8FC0A for ; Tue, 24 May 2011 16:08:50 +0000 (UTC) Received: by yie12 with SMTP id 12so3380315yie.13 for ; Tue, 24 May 2011 09:08:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:date:from:to:subject:message-id:mime-version :content-type:content-disposition:user-agent; bh=ij8B/3v27cjYwK2+PgDD+yRbbAJm/P2fZMOa0eA3doI=; b=Hy9cwYBpPa5Q9Tc/pztORt5okAnkEY94Q7mD7Z71jf33QwTF8/2g8Xjaj6KmrGChKP /hs5W8NUWFcVQpBi06VGBgjK5MHw1BiUxd7BGK9Lkr0CHdlP3lxDQ5/nWyQmOIvXp6Ia GXPO0OurgnJgXj7aYwJUDJdzXKTiQqJFLFYp4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=IlIgguwBuisU7vTz3lSS4l783UBjr3KgeiBKW19KjIeQaS94NLV67U8ieXgKYwdCqJ BQaz65HA+bbJGyjCDD86GyhbEBPqCaAl2KBzlEVuD5cnMmuLF7jCrLpq0b8wFQZSVFsH rzIJrnlnTX5LEaME3QezAR6a/1cQSrXmgew4s= Received: by 10.101.86.16 with SMTP id o16mr5236321anl.135.1306251970194; Tue, 24 May 2011 08:46:10 -0700 (PDT) Received: from oddish.mark-home (Mail1.sandvine.com [64.7.137.162]) by mx.google.com with ESMTPS id d36sm5661881and.30.2011.05.24.08.46.08 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 24 May 2011 08:46:09 -0700 (PDT) Date: Tue, 24 May 2011 11:46:02 -0400 From: Mark Johnston To: freebsd-fs@freebsd.org Message-ID: <20110524154602.GA57782@oddish.mark-home> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Subject: fdisk(1) uses a signed int for slice sizes X-BeenThere: freebsd-fs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Filesystems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 May 2011 16:08:51 -0000 Hello all, fdisk(1) uses a signed int to store slice sizes when reading in a config file. On platforms with sizeof(int) == 4, this prevents users from specifying a size of more than 2^{31}-1 sectors even though the corresponding MBR field is a 32-bit unsigned number. I have a little patch which fixes this; I was going to ask rstone@ to commit it, but I'd like to know if there are any objections/comments first. Thanks, -Mark diff --git a/sbin/fdisk/fdisk.c b/sbin/fdisk/fdisk.c index 8314906..eb81e3b 100644 --- a/sbin/fdisk/fdisk.c +++ b/sbin/fdisk/fdisk.c @@ -108,9 +108,9 @@ typedef struct cmd { char cmd; int n_args; struct arg { - char argtype; - int arg_val; - char *arg_str; + char argtype; + unsigned long arg_val; + char * arg_str; } args[MAX_ARGS]; } CMD; @@ -990,7 +990,7 @@ parse_config_line(char *line, CMD *command) if (isalpha(*cp)) command->args[command->n_args].argtype = *cp++; end = NULL; - command->args[command->n_args].arg_val = strtol(cp, &end, 0); + command->args[command->n_args].arg_val = strtoul(cp, &end, 0); if (cp == end || (!isspace(*end) && *end != '\0')) { char ch; end = cp;