From nobody Sun Dec 14 19:31:06 2025 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E18CE1FB3; Sat, 19 Apr 2025 08:34:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.187 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745051683; cv=none; b=mAix36zCRzgIjMQSk/Xbc3oXo8wRjjDOKuO23YK0OyC/nxQQPeGq+VxFgs3IQtymJtxvE+uRSRJf/VDPo0/W9A7F7iRoBNqHf2Xufrgb/V+i+z5xWgkYYk8lFhVs4J+3QLEtMIyVlK7BFnlQ/cqwm8V1XsLowi3AWmuAK9+mqpw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745051683; c=relaxed/simple; bh=6vfBMEHNRiWKyVQ0+nDbh3AS6ETSW3sPRcK39Li++r8=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=A/Jh52JdB+A3vpPyDtnSkpsN/00xBqHbpbxxwJI5WVroiRR4XMPb9Cb9BL7paW0FiSm9kaeUj8YgpY8HrUE1iwp7im4LiCUBNxCg1TvckXgDrTf5IZ9aa903hxjchqxgSmEh1WA+nCt5UpuX810+P4ELeZfI2dLYBJXgIjgIRTY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.187 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.88.194]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4ZflK46xpzz13KbK; Sat, 19 Apr 2025 16:33:44 +0800 (CST) Received: from kwepemg500017.china.huawei.com (unknown [7.202.181.81]) by mail.maildlp.com (Postfix) with ESMTPS id B03D71402E9; Sat, 19 Apr 2025 16:34:38 +0800 (CST) Received: from huawei.com (10.175.127.227) by kwepemg500017.china.huawei.com (7.202.181.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Sat, 19 Apr 2025 16:34:37 +0800 From: Li Lingfeng To: , , , CC: , , , , , , , Subject: [PATCH 2/2] nfs: handle failure of get_nfs_open_context Date: Sat, 19 Apr 2025 16:53:55 +0800 Message-ID: <20250419085355.1451457-3-lilingfeng3@huawei.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20250419085355.1451457-1-lilingfeng3@huawei.com> References: <20250419085355.1451457-1-lilingfeng3@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To kwepemg500017.china.huawei.com (7.202.181.81) Content-Type: text/plain; charset="utf-8" During initialization of unlockdata or lockdata structures, if acquiring the nfs_open_context fails, the current operation must be aborted to ensure the nfs_open_context remains valid after initialization completes. This is critical because both lock and unlock release callbacks dereference the nfs_open_context - an invalid context could lead to null pointer dereference. Fixes: faf5f49c2d9c ("NFSv4: Make NFS clean up byte range locks asynchronou= sly") Fixes: a5d16a4d090b ("NFSv4: Convert LOCK rpc call into an asynchronous RPC= call") Signed-off-by: Li Lingfeng --- fs/nfs/nfs4proc.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 9f5689c43a50..d76cf0f79f9c 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -7075,24 +7075,27 @@ static struct nfs4_unlockdata *nfs4_alloc_unlockdat= a(struct file_lock *fl, struct nfs4_state *state =3D lsp->ls_state; struct inode *inode =3D state->inode; struct nfs_lock_context *l_ctx; + struct nfs_open_context *open_ctx; =20 p =3D kzalloc(sizeof(*p), GFP_KERNEL); if (p =3D=3D NULL) return NULL; l_ctx =3D nfs_get_lock_context(ctx); - if (!IS_ERR(l_ctx)) { + if (!IS_ERR(l_ctx)) p->l_ctx =3D l_ctx; - } else { - kfree(p); - return NULL; - } + else + goto out_free; + /* Ensure we don't close file until we're done freeing locks! */ + open_ctx =3D get_nfs_open_context(ctx); + if (open_ctx) + p->ctx =3D open_ctx; + else + goto out_free; p->arg.fh =3D NFS_FH(inode); p->arg.fl =3D &p->fl; p->arg.seqid =3D seqid; p->res.seqid =3D seqid; p->lsp =3D lsp; - /* Ensure we don't close file until we're done freeing locks! */ - p->ctx =3D get_nfs_open_context(ctx); locks_init_lock(&p->fl); locks_copy_lock(&p->fl, fl); p->server =3D NFS_SERVER(inode); @@ -7100,6 +7103,9 @@ static struct nfs4_unlockdata *nfs4_alloc_unlockdata(= struct file_lock *fl, nfs4_stateid_copy(&p->arg.stateid, &lsp->ls_stateid); spin_unlock(&state->state_lock); return p; +out_free: + kfree(p); + return NULL; } =20 static void nfs4_locku_release_calldata(void *data) @@ -7327,6 +7333,8 @@ static struct nfs4_lockdata *nfs4_alloc_lockdata(stru= ct file_lock *fl, p->lsp =3D lsp; p->server =3D server; p->ctx =3D get_nfs_open_context(ctx); + if (!p->ctx) + goto out_free_seqid; locks_init_lock(&p->fl); locks_copy_lock(&p->fl, fl); return p; --=20 2.31.1