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=unavailable 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 0CA5ACA9EB9 for ; Sat, 26 Oct 2019 13:28:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CEF422070B for ; Sat, 26 Oct 2019 13:28:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572096505; bh=nkP+P8YBBS9QDsDaMNe3U4+XclMdwFgTQYomNQMcBmM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=iUOTGwcU2iImJHpiIN3fdpF0DMb6BnorF+A/maSFkI4Gk+18MNnnbBQyZPqneY1np ad+DO6u9zK4y2RAby/DuRU2M6951HCaWV466qulTuoSGNYTdRU6rh9FW+NBENKEabH tQidDDLqTu3XJGhViXw5+m9+wHKa15yUeuj3nYL0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728643AbfJZN2Y (ORCPT ); Sat, 26 Oct 2019 09:28:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:42782 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727634AbfJZNVG (ORCPT ); Sat, 26 Oct 2019 09:21:06 -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 58D8321871; Sat, 26 Oct 2019 13:21:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572096065; bh=nkP+P8YBBS9QDsDaMNe3U4+XclMdwFgTQYomNQMcBmM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nKEyCmxnj5McjCL3Q1xyDwJiwxsYRrH1lEqUxwwpmJDM1l4T/CgbvrRrvHHRVLwHy 3qS319xW/SsssdBPtWLPgX7BRqmqOEuDiLFm55U+dp85PP+tGFCPsdGx7ypaNuJK5j eXkLrpe2GcLmUfmK8uOkk67aGpbFr44vLfmOhYBw= 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.19 58/59] ocfs2: fix error handling in ocfs2_setattr() Date: Sat, 26 Oct 2019 09:19:09 -0400 Message-Id: <20191026131910.3435-58-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191026131910.3435-1-sashal@kernel.org> References: <20191026131910.3435-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 9fa35cb6f6e0b..02fe64ada0dbd 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c @@ -1240,6 +1240,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; } } @@ -1249,6 +1250,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