Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp5644181imu; Mon, 26 Nov 2018 03:26:49 -0800 (PST) X-Google-Smtp-Source: AFSGD/WVqS4m65evalPK8YM0Tx43ovxoOMfWHClG3FeyhekbQMWjW6CNV6T/KlV/GR2qEIc0eQfQ X-Received: by 2002:a63:3703:: with SMTP id e3mr23960485pga.348.1543231609493; Mon, 26 Nov 2018 03:26:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543231609; cv=none; d=google.com; s=arc-20160816; b=XsoLU2l/vRdLWRHvcjKRQXg0KojBWZFUjIanU0TJOwzUjCpuR4MJ1mp9mrWWK9L+mX EZHbZEIxnf+Frc62Cpxr7ztTRzD8eGjQIrbqTb1sGZyv3wLA2B45TKGc1wbDoFGl5Rt1 HycjIeyjRNG3qmjwpXHec0vKVUjmgXFSCUIq6hrht6oaHQIyzU18Ysx5jBbu42GY/1Je in3UJToPBwJ5XfEt3ALdFEUbMirkIMy4R23cK6nQ7zJIQ+F3BKMAjUu9QQk/UMbhySXF uNd/GPeQXYErr0FoTv+ciApD73kYR/r9Q5zBjJdRntjl3XPLWG65YIocDq0ByVtAXc5k BxMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=QeKEl6Y2fi4ooBbPXcNK01gt0KucJysD76XOljvbqHA=; b=r+DlAsTnIgoXXFTnrciWbUyRFl2Y2JH7zAluO57x7JZsrXS/DtosgkYAAqvm48EaJc tIzJey87ygs58Kpx6H0YWzwlzcYuwzgPjtTaoyftJGCdW7rH8EipEInsDChhhcceBWpb TruGHUyg5Wk4QgNzLGaz5BvU5WneBd/sZvThDWWfVhlcySPygs6inUWmDhQZgtpp+Fdl oWH51nYW+AvAmrUQ5sGMzDxcVvn7AIDmcH04lAC6e4Txb5Wd9ZfNzCRY7JfiCVzbf7th UhIVxr6xpc42Th83611tleWNbR62hiGQa6Kx5fkYgbcTcIxwo01Z16gHDnG9qe+WDOoZ XxLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ahm7o644; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h65-v6si23958pfc.62.2018.11.26.03.26.26; Mon, 26 Nov 2018 03:26:49 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ahm7o644; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727739AbeKZVss (ORCPT + 99 others); Mon, 26 Nov 2018 16:48:48 -0500 Received: from mail.kernel.org ([198.145.29.99]:57468 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726708AbeKZVsr (ORCPT ); Mon, 26 Nov 2018 16:48:47 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E23D02089F; Mon, 26 Nov 2018 10:55:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1543229702; bh=/cXd9SuMZo2A2J9/FijOO86f+017b1kZUSOPTYddvrY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ahm7o644pg92MQuUEx+6yFNuW2OK7/973R4g5ZjkADhDlhQyi3Xw5qPBcwLG3QOqq 7ABTNkPY/e7tGL8pyW2n/cNA1s3epTMporJvM7RvHcYDrZaPWkFr16NcMg2Rd8NWoK tiggtibC/lHLu5VrwjTjqyc6ay02xwsE21ZU9st8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jann Horn , Andrew Morton , Jeff Mahoney , Eric Biggers , Al Viro , Linus Torvalds , Sasha Levin Subject: [PATCH 4.4 38/70] reiserfs: propagate errors from fill_with_dentries() properly Date: Mon, 26 Nov 2018 11:50:53 +0100 Message-Id: <20181126105050.413575605@linuxfoundation.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181126105046.722096341@linuxfoundation.org> References: <20181126105046.722096341@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit b10298d56c9623f9b173f19959732d3184b35f4f ] fill_with_dentries() failed to propagate errors up to reiserfs_for_each_xattr() properly. Plumb them through. Note that reiserfs_for_each_xattr() is only used by reiserfs_delete_xattrs() and reiserfs_chown_xattrs(). The result of reiserfs_delete_xattrs() is discarded anyway, the only difference there is whether a warning is printed to dmesg. The result of reiserfs_chown_xattrs() does matter because it can block chowning of the file to which the xattrs belong; but either way, the resulting state can have misaligned ownership, so my patch doesn't improve things greatly. Credit for making me look at this code goes to Al Viro, who pointed out that the ->actor calling convention is suboptimal and should be changed. Link: http://lkml.kernel.org/r/20180802163335.83312-1-jannh@google.com Signed-off-by: Jann Horn Reviewed-by: Andrew Morton Cc: Jeff Mahoney Cc: Eric Biggers Cc: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- fs/reiserfs/xattr.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c index 8b32fdaad468..d424b3d4bf3b 100644 --- a/fs/reiserfs/xattr.c +++ b/fs/reiserfs/xattr.c @@ -184,6 +184,7 @@ struct reiserfs_dentry_buf { struct dir_context ctx; struct dentry *xadir; int count; + int err; struct dentry *dentries[8]; }; @@ -206,6 +207,7 @@ fill_with_dentries(struct dir_context *ctx, const char *name, int namelen, dentry = lookup_one_len(name, dbuf->xadir, namelen); if (IS_ERR(dentry)) { + dbuf->err = PTR_ERR(dentry); return PTR_ERR(dentry); } else if (d_really_is_negative(dentry)) { /* A directory entry exists, but no file? */ @@ -214,6 +216,7 @@ fill_with_dentries(struct dir_context *ctx, const char *name, int namelen, "not found for file %pd.\n", dentry, dbuf->xadir); dput(dentry); + dbuf->err = -EIO; return -EIO; } @@ -261,6 +264,10 @@ static int reiserfs_for_each_xattr(struct inode *inode, err = reiserfs_readdir_inode(d_inode(dir), &buf.ctx); if (err) break; + if (buf.err) { + err = buf.err; + break; + } if (!buf.count) break; for (i = 0; !err && i < buf.count && buf.dentries[i]; i++) { -- 2.17.1