From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yw1-f174.google.com (mail-yw1-f174.google.com [209.85.128.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DEC012701B1 for ; Thu, 19 Feb 2026 05:19:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771478343; cv=none; b=BLGpLv+YsqrkimKKUXLyNUvW9pK4o01EbLZ3S5bt6RJltg/GJ0qgPYpIcWF7YrgtJVC5ri0feNR1vhTsK8rTg8lCV3kQycwgeiEE5rAm9qa2Koali5eXcvnymxdJA97RO72VAsLG/qh8bvxwTvMAXSgRaBAMJH/Ne8J+Raqivak= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771478343; c=relaxed/simple; bh=yAOLt5cp2yu+UqjPxG15UIW33I+iBd4PUKxTeXhmCn0=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=LetD1J5m9gHF4Ml/Dj6gNuqkZn8dAkbEO9Lv/0GuhTkbXQFXOv32vw6yIGNt8UYCeuebJTxcsUDNub2yR5XxXvZ5GS6+n53PVsnBLVIFtiH7zrEcVzxEmY4oXYQMc4wM/DvvcopScWFYkq5/aU7xJCqkFKx6vcjNsFumlZghwEI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=VnPevLt+; arc=none smtp.client-ip=209.85.128.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="VnPevLt+" Received: by mail-yw1-f174.google.com with SMTP id 00721157ae682-79427f739b0so5265307b3.3 for ; Wed, 18 Feb 2026 21:19:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1771478341; x=1772083141; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=pZ250747q10WS5+8kR/YF5mfo58r2Yqv/yzlUt3P8g8=; b=VnPevLt+euKQl8t9GJAjsiKRukc4WiYNqYPJr8x/QLcMnQEOYyTkZ2+IafugoVfaa4 wIYL3i4OF2llB2kq90QcaG/buZoXsmIHeQJMJXSBI7i7kM9I+hmamJZ5Ca8oy7ZXPDzl IFjrJZF+Uu1160Phf898Aq7gKTuT20oeQ4IuI4t3NbcY8AiKev53k3DJgxEJDssjnUQ4 gtw6KWqrt8JmTgfgqPJ4xiscr11cQgUQT8WYQLfbM8t7OyPOQdueIJJSaqAoy2jl2GzO d3z/qj6NpT8OdcEeoU1GH8beygJgO6lEwVHvOq0DBqD8mH4MyOZWtAcmDpvDm6EGZV1n yzNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771478341; x=1772083141; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=pZ250747q10WS5+8kR/YF5mfo58r2Yqv/yzlUt3P8g8=; b=K/soma+0t8yqKvIvBwQFZNZZjZIJll5tN+agFoBDX/VKdq8AyF/ElNXoqDUe+6F5Va bvmDEhL6bOs6GjPdEIytn6JqeuKcrEun79EOsNdTVYgl1c19HYazmxh7S6IA6eHS5He4 Izkb6BaDV6b3VTN7/b7Rg8TlGyOx9DG1BFNGCWeq5A/aL7wKIf2r8kGcOYqRSbN5n3y0 FNzHozUN9O3rrX6JTlAl4i3EZuf+WJ3CS5ueI5pTlqJrcHSRcvydHRfXLGJVCxWQLp7X 47+hpJjEIPS4L2yQukcYkk0KoT7QNj5tKrfx+ImVEgzy1eH6dgyucuPSS00F1XMqdb1z 5WxA== X-Forwarded-Encrypted: i=1; AJvYcCWAFH/mGdyFE5gO6moET1XoBbon/82GGey4IVgdpJd1JWRMyDUAfNVJeLYB59wfzRyq21IzIFA=@vger.kernel.org X-Gm-Message-State: AOJu0YyGyXmj/iDwk1cbcsDvA9uH+CKoEhoXwKUvjZZq1vsrzo+8l6MZ E4gEO4GQ0rBhYnkf23wCbgRpXq1WxfvSKM/PEcBhRVSUILNT58S81REC X-Gm-Gg: AZuq6aK4r60Dnw/drB5cQBj4S3O8xSzVo3hZs9bOdEaWKlNFOYIYXDbzio+gnKi1ynd 0YryuFeVEnDrDaCMbVnvY+0V5YYo5zvydGg0c4Gu9vF8aEnS3m5jr+mS6xRtn3XTbhBTFJ+spAs i4Sq7iZNm85lnmZOkhVbcSAey1dcho98v/mn7sS4HfdVrq0RHDexPE4i1JM6YXl47fhRWVBcbet IfYSpWm7+2YGFGJREMaooFWEq4vUrAuLqdX4lenO/IksbrFIyYmMZMsUKTN4naTa9f5w6OJkeMm OTeQ4j7oP4TVc/cfNjl7wB8H4cNnG1Tz41ym0gbQPZtyl3+BqIHLYSwe0QX9sKbVzQqFxjElrf1 AZdnRROTQmHVVQZW6JeTT7q7NJ6bknnHCQlwn6RELmgaCVJ7pJ4CGgF8KLvgA+WjeEab0Snk+uK FMI3BUAY80v5+numEf6cxlzz3Hn5Znzt8v5l04jOzNIkbpZgris29QQRGVhTmD38JH5dVnhKL2C OsYT2c5FxS6hR8VmGNhExYApDei2CItX+tWTtlPOcA= X-Received: by 2002:a05:690c:87:b0:798:1f8:3acc with SMTP id 00721157ae682-79803c7a3ebmr14472327b3.33.1771478340743; Wed, 18 Feb 2026 21:19:00 -0800 (PST) Received: from tux ([2601:7c0:c37c:4c00:e3a8:26f7:7e08:88e1]) by smtp.gmail.com with ESMTPSA id 00721157ae682-7966c23f251sm131638257b3.24.2026.02.18.21.19.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Feb 2026 21:19:00 -0800 (PST) From: Ethan Tidmore To: Carlos Maiolino , NeilBrown Cc: Christian Brauner , Jeff Layton , Amir Goldstein , "Darrick J . Wong" , linux-xfs@vger.kernel.org, linux-kernel@vger.kernel.org, Ethan Tidmore , stable@vger.kernel.org Subject: [PATCH v2] xfs: Fix error pointer dereference Date: Wed, 18 Feb 2026 23:18:41 -0600 Message-ID: <20260219051841.60999-1-ethantidmore06@gmail.com> X-Mailer: git-send-email 2.53.0 Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The function try_lookup_noperm() can return an error pointer and is not checked for one. Add checks for error pointer and propagate it. Fixes: 73597e3e42b4 ("xfs: ensure dentry consistency when the orphanage adopts a file") Cc: # v6.16 Signed-off-by: Ethan Tidmore --- fs/xfs/scrub/orphanage.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/fs/xfs/scrub/orphanage.c b/fs/xfs/scrub/orphanage.c index 52a108f6d5f4..3269a0646e19 100644 --- a/fs/xfs/scrub/orphanage.c +++ b/fs/xfs/scrub/orphanage.c @@ -442,6 +442,9 @@ xrep_adoption_check_dcache( return 0; d_child = try_lookup_noperm(&qname, d_orphanage); + if (IS_ERR(d_child)) + return PTR_ERR(d_child); + if (d_child) { trace_xrep_adoption_check_child(sc->mp, d_child); @@ -464,7 +467,7 @@ xrep_adoption_check_dcache( * There should not be any positive entries for the name, since we've * maintained our lock on the orphanage directory. */ -static void +static int xrep_adoption_zap_dcache( struct xrep_adoption *adopt) { @@ -476,9 +479,12 @@ xrep_adoption_zap_dcache( /* Invalidate all dentries for the adoption name */ d_orphanage = d_find_alias(VFS_I(sc->orphanage)); if (!d_orphanage) - return; + return 0; d_child = try_lookup_noperm(&qname, d_orphanage); + if (IS_ERR(d_child)) + return PTR_ERR(d_child); + while (d_child != NULL) { trace_xrep_adoption_invalidate_child(sc->mp, d_child); @@ -497,6 +503,8 @@ xrep_adoption_zap_dcache( d_invalidate(d_child); dput(d_child); } + + return 0; } /* @@ -592,7 +600,10 @@ xrep_adoption_move( xfs_dir_update_hook(sc->orphanage, sc->ip, 1, adopt->xname); /* Remove negative dentries from the lost+found's dcache */ - xrep_adoption_zap_dcache(adopt); + error = xrep_adoption_zap_dcache(adopt); + if (error) + return error; + return 0; } -- 2.53.0