From mboxrd@z Thu Jan 1 00:00:00 1970 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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 60E14CA9EB9 for ; Sat, 26 Oct 2019 13:23:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2D821214DA for ; Sat, 26 Oct 2019 13:23:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572096228; bh=1jFzCE2rgwVj3btr28TIQMsoAtoaTMpvLSm+D6DXni4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=V8kIHcDnKwEXYTc2As2VMuZegrmjc3ocBUmS0FVkAzUt8jOJRtSCct8uuxqz0z5h2 WXOaqAX/FqIX+4+9o1hOBLJhRlKOO9cZllVufoMZj82epras5boCe9307yYbzylsKa FG0s2kgLKKtLqKzYKZ9Xd1WX8b6hY2uzK2uIOhXg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728268AbfJZNXm (ORCPT ); Sat, 26 Oct 2019 09:23:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:45440 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729941AbfJZNXi (ORCPT ); Sat, 26 Oct 2019 09:23:38 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 75B092245A; Sat, 26 Oct 2019 13:23:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572096217; bh=1jFzCE2rgwVj3btr28TIQMsoAtoaTMpvLSm+D6DXni4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JRTc9zA3KBdqnR8Fr/j35Jiw19bSlDM2Xb+Owc+FNuQN9XKUuD2NvU2cr1I1SGgX5 8Q9oe0IlP370mPMmgV0DkoV1aQJ5k8iIyK/j9CuChjz4Phf31qqmhbltu3g89bwVa5 L85xnDymQ5LMMW9FW6jHM/sd2tLPj9t7iBff4hlY= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Chengguang Xu , Joseph Qi , Mark Fasheh , Joel Becker , Junxiao Bi , Changwei Ge , Gang He , Jun Piao , Andrew Morton , Linus Torvalds , Sasha Levin Subject: [PATCH AUTOSEL 4.4 16/17] ocfs2: fix error handling in ocfs2_setattr() Date: Sat, 26 Oct 2019 09:23:00 -0400 Message-Id: <20191026132302.4622-16-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191026132302.4622-1-sashal@kernel.org> References: <20191026132302.4622-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chengguang Xu [ Upstream commit ce750f43f5790de74c1644c39d78f684071658d1 ] 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 Reviewed-by: Joseph Qi Cc: Mark Fasheh Cc: Joel Becker Cc: Junxiao Bi Cc: Changwei Ge Cc: Gang He Cc: Jun Piao Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- fs/ocfs2/file.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index 1d738723a41ad..0d09fe7b7c81f 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c @@ -1219,6 +1219,7 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr) 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; } } @@ -1228,6 +1229,7 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr) 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; } } -- 2.20.1