Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E6210C2BA19 for ; Thu, 23 Apr 2020 11:07:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C8E3B2076C for ; Thu, 23 Apr 2020 11:07:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727883AbgDWLH3 (ORCPT ); Thu, 23 Apr 2020 07:07:29 -0400 Received: from mx2.suse.de ([195.135.220.15]:47046 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726805AbgDWLH3 (ORCPT ); Thu, 23 Apr 2020 07:07:29 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 8C0D8B08C; Thu, 23 Apr 2020 11:07:27 +0000 (UTC) Received: by quack2.suse.cz (Postfix, from userid 1000) id 75D621E1293; Thu, 23 Apr 2020 13:07:27 +0200 (CEST) Date: Thu, 23 Apr 2020 13:07:27 +0200 From: Jan Kara To: Jeffle Xu Cc: tytso@mit.edu, jack@suse.cz, linux-ext4@vger.kernel.org, joseph.qi@linux.alibaba.com Subject: Re: [PATCH v2] ext4: fix error pointer dereference Message-ID: <20200423110727.GG3737@quack2.suse.cz> References: <1587628004-95123-1-git-send-email-jefflexu@linux.alibaba.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1587628004-95123-1-git-send-email-jefflexu@linux.alibaba.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org On Thu 23-04-20 15:46:44, Jeffle Xu wrote: > Don't pass error pointers to brelse(). > > commit 7159a986b420 ("ext4: fix some error pointer dereferences") has fixed > some cases, fix the remaining one case. > > Once ext4_xattr_block_find()->ext4_sb_bread() failed, error pointer is > stored in @bs->bh, which will be passed to brelse() in the cleanup > routine of ext4_xattr_set_handle(). This will then cause a NULL panic > crash in __brelse(). > > BUG: unable to handle kernel NULL pointer dereference at 000000000000005b > RIP: 0010:__brelse+0x1b/0x50 > Call Trace: > ext4_xattr_set_handle+0x163/0x5d0 > ext4_xattr_set+0x95/0x110 > __vfs_setxattr+0x6b/0x80 > __vfs_setxattr_noperm+0x68/0x1b0 > vfs_setxattr+0xa0/0xb0 > setxattr+0x12c/0x1a0 > path_setxattr+0x8d/0xc0 > __x64_sys_setxattr+0x27/0x30 > do_syscall_64+0x60/0x250 > entry_SYSCALL_64_after_hwframe+0x49/0xbe > > In this case, @bs->bh stores '-EIO' actually. > > Fixes: fb265c9cb49e ("ext4: add ext4_sb_bread() to disambiguate ENOMEM cases") > Signed-off-by: Jeffle Xu > Reviewed-by: Joseph Qi > Cc: stable@kernel.org # 2.6.19 Thanks for the patch! It looks good to me. You can add: Reviewed-by: Jan Kara Honza > --- > fs/ext4/xattr.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c > index 21df43a..01ba663 100644 > --- a/fs/ext4/xattr.c > +++ b/fs/ext4/xattr.c > @@ -1800,8 +1800,11 @@ struct ext4_xattr_block_find { > if (EXT4_I(inode)->i_file_acl) { > /* The inode already has an extended attribute block. */ > bs->bh = ext4_sb_bread(sb, EXT4_I(inode)->i_file_acl, REQ_PRIO); > - if (IS_ERR(bs->bh)) > - return PTR_ERR(bs->bh); > + if (IS_ERR(bs->bh)) { > + error = PTR_ERR(bs->bh); > + bs->bh = NULL; > + return error; > + } > ea_bdebug(bs->bh, "b_count=%d, refcount=%d", > atomic_read(&(bs->bh->b_count)), > le32_to_cpu(BHDR(bs->bh)->h_refcount)); > -- > 1.8.3.1 > -- Jan Kara SUSE Labs, CR