From owner-svn-src-head@freebsd.org Wed Apr 12 16:00:01 2017 Return-Path: Delivered-To: svn-src-head@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 047CED3A451; Wed, 12 Apr 2017 16:00:01 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: from mail-wm0-f45.google.com (mail-wm0-f45.google.com [74.125.82.45]) (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 B29F2691; Wed, 12 Apr 2017 16:00:00 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: by mail-wm0-f45.google.com with SMTP id o81so91269769wmb.1; Wed, 12 Apr 2017 09:00:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:reply-to:in-reply-to:references :from:date:message-id:subject:to:cc; bh=Hc7MUahevWXwFTv4XlT2l7hDlOzZ3RXNJLKiFDgeNW0=; b=TxHK+/OgWt9bLvfGLp367eFsTKUFnBTWgCF7jM+Dw2tMz1j5+nlEoZbykBE9OBfzXA CZo38YTSwDQhk1NBYjH6d+SBrQHYyHcXOtC053V2zZEVo9MJCyKZS1N6tRxYs0wiRwz7 bkK1PEbfijlP+xSs7m23IiJkxhXiDjsb/za1KgvOCpbLAqIo5vQwuglFdQBrShfTzV42 aCR5Q7mPUKMvohd7iHBUr9x6UaDSV2K/9MIgfIBmMuOm+S9t0y81pZx+mdW7LAQM/mxe QV5D3+zaqnwTNPW61Up3pfpN9c++Q8twKh4hvu6LkciGPzz5lrhc96WhC4aUaS6DI28Z O9fg== X-Gm-Message-State: AN3rC/4ulrhkILHeHMWeS44ZS16oDljhKJvlnQSq05ZD6sFPLW30ahMJ BIFgO7Ubqnm1HxSRFac= X-Received: by 10.28.225.10 with SMTP id y10mr19266320wmg.34.1492012315164; Wed, 12 Apr 2017 08:51:55 -0700 (PDT) Received: from mail-wr0-f170.google.com (mail-wr0-f170.google.com. [209.85.128.170]) by smtp.gmail.com with ESMTPSA id o15sm26010281wra.61.2017.04.12.08.51.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Apr 2017 08:51:55 -0700 (PDT) Received: by mail-wr0-f170.google.com with SMTP id l28so20304152wre.0; Wed, 12 Apr 2017 08:51:55 -0700 (PDT) X-Received: by 10.223.131.67 with SMTP id 61mr3781432wrd.57.1492012314865; Wed, 12 Apr 2017 08:51:54 -0700 (PDT) MIME-Version: 1.0 Reply-To: cem@freebsd.org Received: by 10.80.169.4 with HTTP; Wed, 12 Apr 2017 08:51:54 -0700 (PDT) In-Reply-To: <201704112155.v3BLtepk065823@repo.freebsd.org> References: <201704112155.v3BLtepk065823@repo.freebsd.org> From: Conrad Meyer Date: Wed, 12 Apr 2017 08:51:54 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r316718 - head/sbin/mksnap_ffs To: Maxim Sobolev Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2017 16:00:01 -0000 Hi Maxim, This breaks several stbuf checks in main() following the stat() call you removed to isdir(). Coverity reported this as CID 1374247. On Tue, Apr 11, 2017 at 2:55 PM, Maxim Sobolev wrote: > Author: sobomax > Date: Tue Apr 11 21:55:39 2017 > New Revision: 316718 > URL: https://svnweb.freebsd.org/changeset/base/316718 > > ... > --- head/sbin/mksnap_ffs/mksnap_ffs.c Tue Apr 11 20:28:15 2017 (r316717) > +++ head/sbin/mksnap_ffs/mksnap_ffs.c Tue Apr 11 21:55:39 2017 (r316718) > @@ -58,6 +58,33 @@ usage(void) > errx(EX_USAGE, "usage: mksnap_ffs snapshot_name"); > } > > +static int > +isdir(const char *path) > +{ > + struct stat stbuf; > + > + if (stat(path, &stbuf) < 0) > + return (-1); ^^^^^^^^^^^^^^^^^^ moved here > + if (!S_ISDIR(stbuf.st_mode)) > + return (0); > + return (1); > +} > ... > @@ -96,16 +123,33 @@ main(int argc, char **argv) > } > if (statfs(path, &stfsbuf) < 0) > err(1, "%s", path); > - if (stat(path, &stbuf) < 0) ^^^^^^^^^^^^^^^^^^^ from here > + switch (isdir(path)) { > + case -1: > err(1, "%s", path); > - if (!S_ISDIR(stbuf.st_mode)) > + case 0: > errx(1, "%s: Not a directory", path); > + default: > + break; > + } > if (access(path, W_OK) < 0) > err(1, "Lack write permission in %s", path); > if ((stbuf.st_mode & S_ISTXT) && stbuf.st_uid != getuid()) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ now uninitialized use