From owner-svn-src-all@freebsd.org Tue Aug 9 14:55:02 2016 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 77E55BB40F8; Tue, 9 Aug 2016 14:55:02 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: from mail-it0-f48.google.com (mail-it0-f48.google.com [209.85.214.48]) (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 4B9541A1F; Tue, 9 Aug 2016 14:55:02 +0000 (UTC) (envelope-from cse.cem@gmail.com) Received: by mail-it0-f48.google.com with SMTP id u186so14550642ita.0; Tue, 09 Aug 2016 07:55:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:reply-to:in-reply-to:references :from:date:message-id:subject:to:cc; bh=cHtD8xSWS1O8gvojkWIJ17yb3DZ3LmT9QbmGFx0jV18=; b=LSxwx3/q6gRLBJlVvzcednvpfvC6O5SHKgJtLK5rmUOE/7RJWpdMbLrAsfoj2Fz5Op MQxULNoMmyYHexydWMPAqWKl0oKN18j8cdAgzMfCrnGWqPjMctjNYnzpZzh5kzjCUyoR HgSlDtz5BqmDze7aP7Vx1jYbjHAo8/atehwzdjrCTSWHrWpvlY8pEWry48X7REf6X6mg AkDOnRP2pxkPWK4QUyvX34vWwchMf9CiS9zQXH0eAsrvlz82G+4CPEa53Uq8RlEo35IC Aokf7yraOFf63fw2ErBIojRmSOznf2EkefhC/C/aKa42X6gz77uaaknJ7tCivrhoYrbO 3VCQ== X-Gm-Message-State: AEkoouupdivU1r/yUF0R7WES+Ypxm2ygOTmyz+fdNL5B6fyhLm/++4HzjMMV3L3Gr+QzdA== X-Received: by 10.36.190.137 with SMTP id i131mr5617505itf.0.1470754495675; Tue, 09 Aug 2016 07:54:55 -0700 (PDT) Received: from mail-io0-f173.google.com (mail-io0-f173.google.com. [209.85.223.173]) by smtp.gmail.com with ESMTPSA id e196sm16727473ioe.3.2016.08.09.07.54.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Aug 2016 07:54:55 -0700 (PDT) Received: by mail-io0-f173.google.com with SMTP id b62so13732830iod.3; Tue, 09 Aug 2016 07:54:55 -0700 (PDT) X-Received: by 10.107.28.11 with SMTP id c11mr117110107ioc.7.1470754494861; Tue, 09 Aug 2016 07:54:54 -0700 (PDT) MIME-Version: 1.0 Reply-To: cem@freebsd.org Received: by 10.36.220.129 with HTTP; Tue, 9 Aug 2016 07:54:54 -0700 (PDT) In-Reply-To: <201608090611.u796BP4S064574@repo.freebsd.org> References: <201608090611.u796BP4S064574@repo.freebsd.org> From: Conrad Meyer Date: Tue, 9 Aug 2016 07:54:54 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r303869 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs To: Andriy Gapon Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 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: Tue, 09 Aug 2016 14:55:02 -0000 This was detected by Coverity as CID 1361483, for what it's worth. Best, Conrad On Mon, Aug 8, 2016 at 11:11 PM, Andriy Gapon wrote: > Author: avg > Date: Tue Aug 9 06:11:24 2016 > New Revision: 303869 > URL: https://svnweb.freebsd.org/changeset/base/303869 > > Log: > fix a zfs cross-device rename crash introduced in r303763 > > The problem was that 'zfsvfs' variable was not initialized if the error > was detected, but in the exit path the variable was dereferenced before > the error code was checked. > > Reported by: np > MFC after: 3 days > X-MFC with: r303763 > > Modified: > head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c > > Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c > ============================================================================== > --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Tue Aug 9 04:59:55 2016 (r303868) > +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Tue Aug 9 06:11:24 2016 (r303869) > @@ -3956,7 +3956,7 @@ unlockout: /* all 4 vnodes are locked, > VOP_UNLOCK(sdvp, 0); > > out: /* original two vnodes are locked */ > - if (zfsvfs->z_os->os_sync == ZFS_SYNC_ALWAYS && error == 0) > + if (error == 0 && zfsvfs->z_os->os_sync == ZFS_SYNC_ALWAYS) > zil_commit(zilog, 0); > > if (*tvpp != NULL) >