Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp2399451lqp; Sun, 24 Mar 2024 17:51:18 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCX/LxbbJKoQNNgbaO9BN9vtxKIUH9P9xq2oALqmQPUwGv373zYBU7u1Brh+27X/Lp9RqvE4VAlCUZQ2EPl4VFy6mcSC1jloNff3EGPRrw== X-Google-Smtp-Source: AGHT+IGC02oXC0vmP4WnS+1nwReX2L4/JOwMZGpjLv0c3z/J1/9WPEZpi+2t009DlYxqf/2u2emE X-Received: by 2002:a05:620a:454e:b0:78a:4633:ae20 with SMTP id u14-20020a05620a454e00b0078a4633ae20mr7789289qkp.0.1711327878649; Sun, 24 Mar 2024 17:51:18 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711327878; cv=pass; d=google.com; s=arc-20160816; b=uH7/8ZsiWcg3RhJIAIJuUmvB3b4FnUN2x4H4xTVPJrYeOBjbU0ZK1j0R74vSsUKezm m0xYTMC3NEBtWiqloyF15bf0FBaaxkNnpm8Rh/ZH7EekRIE9jw075fvDr1kIV/jd/8G/ zFxH4yRV1YsH1xRFG/Pvez8ENpFM0gVDBUi+CGS51Mu6i0HBocjXEwcIqubNogK8GSr/ n7kPWLqDbuTgeM8wTdmSnu5uBvjYcSsSMQjCLoGgc0qDhGbVoVIgq+uqD7DfaOuHYE7X gHLRq4NF3JQl+R7MMbKVXOpd99Tmyv07jj6F9uJuOUS/lpYGdtYgTv/+AYjzhkvBMxJV HgvQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=l/Qch5t7+aNaB/DJCOjmi6V6N1R+2E+i6m/2NKFFj1w=; fh=YvG6gtUsmSQFZHRVE71MtOW6RCI7Mhv+FhcJCnQ9zac=; b=GQy8pZlbE6dHlJz9VREABP4KITGcazcfSRPNRtBkaSQ5WVabR9j9qp8h4SKMa1Aymi CvoNScfggnM23GDLLeL8sbFN7vwnLkwVbXq5YHV6PBB6ClRhxTDVqlOLOG2ADm38jew2 /g64nKbdBmVwymYvEreTZRpSxOZFV0Ar/rELNBhK2XbPKUiJ2WP4G0yR2ai4v4A8H2t5 8L6KKvOsh0R+3ZsG7pexQ3+kSHKXzcR0QLJQHLfYxAIIfQ1PiMkSGF3z+utqEjux6WN+ 85lWwlHMqUV59CVr2oTsjy3Mv7WvD9jxhaN+7DSp5ly4WnanTBtQDoKn09PtKsJ1RP22 vMOA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="LvE4Drw/"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-113496-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-113496-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id bk40-20020a05620a1a2800b00789fa78c054si4769592qkb.406.2024.03.24.17.51.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Mar 2024 17:51:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-113496-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="LvE4Drw/"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-113496-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-113496-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 56DA11C241F8 for ; Mon, 25 Mar 2024 00:51:18 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1AB2013D506; Sun, 24 Mar 2024 22:44:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="LvE4Drw/" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 2D4141B8FD4; Sun, 24 Mar 2024 22:44:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711320298; cv=none; b=OE6x9QeUifsooBlc0Fv2At7tlhRircNWBhsjheS6vdrKO7m4Sc42Ys//GWRjIldvcJ7FobJlLTatHN82xAqq1GFdt9rh/vnWyJhHi3ZaoZbpYL7ekTLE8BZiDDkkrDdGcwiOwDttUNSbucNoHQBn9CrZQWbzgDPSYo30OoKYspI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711320298; c=relaxed/simple; bh=Ob+u0v7iJbF2fdhov1SjWGCt8FchSjZcmIy7w6TcGok=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Nod6H/7ezwarJBx60O8JwxoVgU0a8P2O1fkNPzYUWavqYe7XS4WM1DqhilWxSg6/E1SUn+8iTrR+cXvzCf5IpbsrB5QFRdATo/gKOjqCtO1KxxBLUtdUF6kp4E50hPNkrQC2pTY31z1hJ3SKBWIF5Io+JAfCEKL0MzhfT8GXvUo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LvE4Drw/; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 557B3C43394; Sun, 24 Mar 2024 22:44:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711320298; bh=Ob+u0v7iJbF2fdhov1SjWGCt8FchSjZcmIy7w6TcGok=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LvE4Drw/E4cDThPVXG+9oQLKhvoAt8w2L/qGlG3lZKVyutevwBPbWRxZshHwNZaBs Qi/qYp2P9ji0dQOq72PutCgeLWS7m65tgjn3ek0jiAjliJhUsUaijSIKr7YunYh9fC psM4kC3Cy04kacwacjs0U11Oymq0GeYMZsazRsy4UTf7uXLd0lzmJ3qLvJoSTEDx2A m+40XyMhEyfTRyTAtZeykOohpTrIF6yhtCBVf27lsDkixWubGjgW5CQEqZSFoD2OAl GMi9F5ZXUn2wrBdKpFXBZ1kHV1T8raqHIr4q9jpkVjsZF4BxZvWgY6efuF9tyu8fQY SBRsV+3vSSVUA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Josef Bacik , Jeff Layton , Trond Myklebust , Sasha Levin Subject: [PATCH 6.8 605/715] nfs: fix panic when nfs4_ff_layout_prepare_ds() fails Date: Sun, 24 Mar 2024 18:33:04 -0400 Message-ID: <20240324223455.1342824-606-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324223455.1342824-1-sashal@kernel.org> References: <20240324223455.1342824-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Josef Bacik [ Upstream commit 719fcafe07c12646691bd62d7f8d94d657fa0766 ] We've been seeing the following panic in production BUG: kernel NULL pointer dereference, address: 0000000000000065 PGD 2f485f067 P4D 2f485f067 PUD 2cc5d8067 PMD 0 RIP: 0010:ff_layout_cancel_io+0x3a/0x90 [nfs_layout_flexfiles] Call Trace: ? __die+0x78/0xc0 ? page_fault_oops+0x286/0x380 ? __rpc_execute+0x2c3/0x470 [sunrpc] ? rpc_new_task+0x42/0x1c0 [sunrpc] ? exc_page_fault+0x5d/0x110 ? asm_exc_page_fault+0x22/0x30 ? ff_layout_free_layoutreturn+0x110/0x110 [nfs_layout_flexfiles] ? ff_layout_cancel_io+0x3a/0x90 [nfs_layout_flexfiles] ? ff_layout_cancel_io+0x6f/0x90 [nfs_layout_flexfiles] pnfs_mark_matching_lsegs_return+0x1b0/0x360 [nfsv4] pnfs_error_mark_layout_for_return+0x9e/0x110 [nfsv4] ? ff_layout_send_layouterror+0x50/0x160 [nfs_layout_flexfiles] nfs4_ff_layout_prepare_ds+0x11f/0x290 [nfs_layout_flexfiles] ff_layout_pg_init_write+0xf0/0x1f0 [nfs_layout_flexfiles] __nfs_pageio_add_request+0x154/0x6c0 [nfs] nfs_pageio_add_request+0x26b/0x380 [nfs] nfs_do_writepage+0x111/0x1e0 [nfs] nfs_writepages_callback+0xf/0x30 [nfs] write_cache_pages+0x17f/0x380 ? nfs_pageio_init_write+0x50/0x50 [nfs] ? nfs_writepages+0x6d/0x210 [nfs] ? nfs_writepages+0x6d/0x210 [nfs] nfs_writepages+0x125/0x210 [nfs] do_writepages+0x67/0x220 ? generic_perform_write+0x14b/0x210 filemap_fdatawrite_wbc+0x5b/0x80 file_write_and_wait_range+0x6d/0xc0 nfs_file_fsync+0x81/0x170 [nfs] ? nfs_file_mmap+0x60/0x60 [nfs] __x64_sys_fsync+0x53/0x90 do_syscall_64+0x3d/0x90 entry_SYSCALL_64_after_hwframe+0x46/0xb0 Inspecting the core with drgn I was able to pull this >>> prog.crashed_thread().stack_trace()[0] #0 at 0xffffffffa079657a (ff_layout_cancel_io+0x3a/0x84) in ff_layout_cancel_io at fs/nfs/flexfilelayout/flexfilelayout.c:2021:27 >>> prog.crashed_thread().stack_trace()[0]['idx'] (u32)1 >>> prog.crashed_thread().stack_trace()[0]['flseg'].mirror_array[1].mirror_ds (struct nfs4_ff_layout_ds *)0xffffffffffffffed This is clear from the stack trace, we call nfs4_ff_layout_prepare_ds() which could error out initializing the mirror_ds, and then we go to clean it all up and our check is only for if (!mirror->mirror_ds). This is inconsistent with the rest of the users of mirror_ds, which have if (IS_ERR_OR_NULL(mirror_ds)) to keep from tripping over this exact scenario. Fix this up in ff_layout_cancel_io() to make sure we don't panic when we get an error. I also spot checked all the other instances of checking mirror_ds and we appear to be doing the correct checks everywhere, only unconditionally dereferencing mirror_ds when we know it would be valid. Signed-off-by: Josef Bacik Fixes: b739a5bd9d9f ("NFSv4/flexfiles: Cancel I/O if the layout is recalled or revoked") Reviewed-by: Jeff Layton Signed-off-by: Trond Myklebust Signed-off-by: Sasha Levin --- fs/nfs/flexfilelayout/flexfilelayout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nfs/flexfilelayout/flexfilelayout.c b/fs/nfs/flexfilelayout/flexfilelayout.c index ef817a0475ffa..3e724cb7ef01d 100644 --- a/fs/nfs/flexfilelayout/flexfilelayout.c +++ b/fs/nfs/flexfilelayout/flexfilelayout.c @@ -2016,7 +2016,7 @@ static void ff_layout_cancel_io(struct pnfs_layout_segment *lseg) for (idx = 0; idx < flseg->mirror_array_cnt; idx++) { mirror = flseg->mirror_array[idx]; mirror_ds = mirror->mirror_ds; - if (!mirror_ds) + if (IS_ERR_OR_NULL(mirror_ds)) continue; ds = mirror->mirror_ds->ds; if (!ds) -- 2.43.0