Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp645039ybz; Wed, 22 Apr 2020 05:23:47 -0700 (PDT) X-Google-Smtp-Source: APiQypJ73rBL5yNq7LXOXR6/DzfZschppxDOM73oIWuCl1qS/v9GJfU59J/bMxscgbnc7ZPjFi0O X-Received: by 2002:a05:6402:154:: with SMTP id s20mr23442858edu.224.1587558226864; Wed, 22 Apr 2020 05:23:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587558226; cv=none; d=google.com; s=arc-20160816; b=vUv5Wegqe+09bXc3OLavWZJLLURbbqkJtgeo7NWtN4auegvSTy95f2WQXdrCzqyT9E cJ9ciKBE/9t090HvyGZx7NZQl7KPE7h1MlC6jNuy+6GJHgusce2xV4nGTRmFvmaSiqLa GmzaRynI6KIZ6UEjEegfzqZ/s68gRkwKWH/f+hgAbYffCuLFbPwGdwe7gBlFD1qKApuM 7MfsnwX4aDdwyM6uAaGljioPSxI9XWvyF3ItZjGfTCHMEDMJy3OrYTQrj9tiEk4VgKm1 UWQCql0lpm12PhrykVBULrpBib+J8DFZwJBehLjTmgwHH0qilQPGRe4qRgOH20b9Vl2V hRAw== 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=KrzlPI601mCHwBRVRtmRoXZT89n6zQTVrPuIlTlolTA=; b=Lurtvg2Ch89Fh0V2okV8S8S4GOM/rNpvE7O5ZtpqJH180VtJfwl+wFQ6/RUmVaLOBQ rLsGVoh3X+LZq3goOu48TEMSiC9mB2Jgy3u73tECvSnGy3U22yIKra566ApO+rxFIsb9 RCPlSGT0o53D2ifradlBOk67eVSd+cd+93GbDb5hMYHjtOveFkaeS1HPqnpDp4RwmuRW fgsTv0Wpt+Do9JocOfRYavSYHU23iCMO+vXg0etZwD1ZhPZfsuyyuxMCLnjILWWNIsf4 7UgBx1BHmvQel5rlaDzIzy7R8ceGlvTP0o2avlOVypFquiI207CEeX/sYMTyAkar294Q awGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Excz8Fma; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id k11si3409491edx.311.2020.04.22.05.23.23; Wed, 22 Apr 2020 05:23:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Excz8Fma; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730911AbgDVK1i (ORCPT + 99 others); Wed, 22 Apr 2020 06:27:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:36576 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730886AbgDVK13 (ORCPT ); Wed, 22 Apr 2020 06:27:29 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 BCC642071E; Wed, 22 Apr 2020 10:27:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587551249; bh=aYUuWPfJpzqoqPVjphiZ2zRMzjSHaBbquwqd8TH1J4o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Excz8FmavcyKQI5HtXypDJHXZziYgEqSqHUDQNDYtZKIfZ4Plw+rUzUdC+43VYkKj J73kKNZYMUSmFp9sbYq5P3b6TOK6LHJDcAM1FrfiAlqJsuWXEPFfYgbij2e7SMVvTF dbVSyK1CyhkPrQ2Pubsm0bpQTOn26xJI4ZurRxqM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chao Yu , Jaegeuk Kim , Sasha Levin Subject: [PATCH 5.6 119/166] f2fs: fix NULL pointer dereference in f2fs_write_begin() Date: Wed, 22 Apr 2020 11:57:26 +0200 Message-Id: <20200422095101.400234165@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200422095047.669225321@linuxfoundation.org> References: <20200422095047.669225321@linuxfoundation.org> User-Agent: quilt/0.66 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 From: Chao Yu [ Upstream commit 62f63eea291b50a5677ae7503ac128803174698a ] BUG: kernel NULL pointer dereference, address: 0000000000000000 RIP: 0010:f2fs_write_begin+0x823/0xb90 [f2fs] Call Trace: f2fs_quota_write+0x139/0x1d0 [f2fs] write_blk+0x36/0x80 [quota_tree] get_free_dqblk+0x42/0xa0 [quota_tree] do_insert_tree+0x235/0x4a0 [quota_tree] do_insert_tree+0x26e/0x4a0 [quota_tree] do_insert_tree+0x26e/0x4a0 [quota_tree] do_insert_tree+0x26e/0x4a0 [quota_tree] qtree_write_dquot+0x70/0x190 [quota_tree] v2_write_dquot+0x43/0x90 [quota_v2] dquot_acquire+0x77/0x100 f2fs_dquot_acquire+0x2f/0x60 [f2fs] dqget+0x310/0x450 dquot_transfer+0x7e/0x120 f2fs_setattr+0x11a/0x4a0 [f2fs] notify_change+0x349/0x480 chown_common+0x168/0x1c0 do_fchownat+0xbc/0xf0 __x64_sys_fchownat+0x20/0x30 do_syscall_64+0x5f/0x220 entry_SYSCALL_64_after_hwframe+0x44/0xa9 Passing fsdata parameter to .write_{begin,end} in f2fs_quota_write(), so that if quota file is compressed one, we can avoid above NULL pointer dereference when updating quota content. Signed-off-by: Chao Yu Signed-off-by: Jaegeuk Kim Signed-off-by: Sasha Levin --- fs/f2fs/super.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 3669f060b6257..8deb0a260d928 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -1929,6 +1929,7 @@ static ssize_t f2fs_quota_write(struct super_block *sb, int type, int offset = off & (sb->s_blocksize - 1); size_t towrite = len; struct page *page; + void *fsdata = NULL; char *kaddr; int err = 0; int tocopy; @@ -1938,7 +1939,7 @@ static ssize_t f2fs_quota_write(struct super_block *sb, int type, towrite); retry: err = a_ops->write_begin(NULL, mapping, off, tocopy, 0, - &page, NULL); + &page, &fsdata); if (unlikely(err)) { if (err == -ENOMEM) { congestion_wait(BLK_RW_ASYNC, HZ/50); @@ -1954,7 +1955,7 @@ static ssize_t f2fs_quota_write(struct super_block *sb, int type, flush_dcache_page(page); a_ops->write_end(NULL, mapping, off, tocopy, tocopy, - page, NULL); + page, fsdata); offset = 0; towrite -= tocopy; off += tocopy; -- 2.20.1