diff mbox series

[09/26] ocfs2: fix error handling in ocfs2_setattr()

Message ID	20191019031947.0Tw492E24%akpm@linux-foundation.org (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=Badx=YM=kvack.org=owner-linux-mm@kernel.org> DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 569E722459 Date: Fri, 18 Oct 2019 20:19:47 -0700 From: akpm@linux-foundation.org To: akpm@linux-foundation.org, cgxu519@mykernel.net, gechangwei@live.cn, ghe@suse.com, jlbec@evilplan.org, joseph.qi@linux.alibaba.com, junxiao.bi@oracle.com, linux-mm@kvack.org, mark@fasheh.com, mm-commits@vger.kernel.org, piaojun@huawei.com, torvalds@linux-foundation.org Subject: [patch 09/26] ocfs2: fix error handling in ocfs2_setattr() Message-ID: <20191019031947.0Tw492E24%akpm@linux-foundation.org> User-Agent: s-nail v14.8.16 Sender: owner-linux-mm@kvack.org Precedence: bulk
Series	[01/26] drivers/base/memory.c: don't access uninitialized memmaps in soft_offline_page_store() \| expand [01/26] drivers/base/memory.c: don't access uninitialized memmaps in soft_offline_page_store() [02/26] fs/proc/page.c: don't access uninitialized memmaps in fs/proc/page.c [03/26] mm/memory-failure.c: don't access uninitialized memmaps in memory_failure() [04/26] scripts/gdb: fix lx-dmesg when CONFIG_PRINTK_CALLER is set [05/26] mm/page_owner: don't access uninitialized memmaps when reading /proc/pagetypeinfo [06/26] mm/memory_hotplug: don't access uninitialized memmaps in shrink_pgdat_span() [07/26] mm/memunmap: don't access uninitialized memmap in memunmap_pages() [08/26] mm: memcg/slab: fix panic in __free_slab() caused by premature memcg pointer release [09/26] ocfs2: fix error handling in ocfs2_setattr() [10/26] mm/gup_benchmark: add a missing "w" to getopt string [11/26] mm/gup: fix a misnamed "write" argument, and a related bug [12/26] mm: memcg: get number of pages on the LRU list in memcgroup base on lru_zone_size [13/26] mm: memblock: do not enforce current limit for memblock_phys* family [14/26] hugetlbfs: don't access uninitialized memmaps in pfn_range_valid_gigantic() [15/26] ocfs2: fix panic due to ocfs2_wq is null [16/26] mm/memcontrol: update lruvec counters in mem_cgroup_move_account [17/26] zram: fix race between backing_dev_show and backing_dev_store [18/26] mm: include <linux/huge_mm.h> for is_vma_temporary_stack [19/26] mm/filemap.c: include <linux/ramfs.h> for generic_file_vm_ops definition [20/26] mm/init-mm.c: include <linux/mman.h> for vm_committed_as_batch [21/26] proc/meminfo: fix output alignment [22/26] mm/thp: fix node page state in split_huge_page_to_list() [23/26] mm/vmscan.c: support removing arbitrary sized pages from mapping [24/26] mm/thp: allow dropping THP from page cache [25/26] kernel/events/uprobes.c: only do FOLL_SPLIT_PMD for uprobe register [26/26] scripts/gdb: fix debugging modules on s390

Commit Message

Andrew Morton Oct. 19, 2019, 3:19 a.m. UTC

From: Chengguang Xu <cgxu519@mykernel.net>
Subject: ocfs2: fix error handling in ocfs2_setattr()

Should set transfer_to[USRQUOTA/GRPQUOTA] to NULL on error case before
jumping to do dqput().

Link: http://lkml.kernel.org/r/20191010082349.1134-1-cgxu519@mykernel.net
Signed-off-by: Chengguang Xu <cgxu519@mykernel.net>
Reviewed-by: Joseph Qi <joseph.qi@linux.alibaba.com>
Cc: Mark Fasheh <mark@fasheh.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Changwei Ge <gechangwei@live.cn>
Cc: Gang He <ghe@suse.com>
Cc: Jun Piao <piaojun@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/ocfs2/file.c |    2 ++
 1 file changed, 2 insertions(+)

diff mbox series

Patch

--- a/fs/ocfs2/file.c~resend-ocfs2-fix-error-handling-in-ocfs2_setattr
+++ a/fs/ocfs2/file.c
@@ -1230,6 +1230,7 @@  int ocfs2_setattr(struct dentry *dentry,
 			transfer_to[USRQUOTA] = dqget(sb, make_kqid_uid(attr->ia_uid));
 			if (IS_ERR(transfer_to[USRQUOTA])) {
 				status = PTR_ERR(transfer_to[USRQUOTA]);
+				transfer_to[USRQUOTA] = NULL;
 				goto bail_unlock;
 			}
 		}
@@ -1239,6 +1240,7 @@  int ocfs2_setattr(struct dentry *dentry,
 			transfer_to[GRPQUOTA] = dqget(sb, make_kqid_gid(attr->ia_gid));
 			if (IS_ERR(transfer_to[GRPQUOTA])) {
 				status = PTR_ERR(transfer_to[GRPQUOTA]);
+				transfer_to[GRPQUOTA] = NULL;
 				goto bail_unlock;
 			}
 		}