From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.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 EC34F3126D4 for ; Fri, 20 Feb 2026 10:01:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771581703; cv=none; b=R9NA7Q3QUSXOoh4iafjtI03kIrzC+YtdEK6pyMcp2nTMwAw2u9x00JlUR1eX3GQO7InuA5rvRgNg2H1ZHHF+cmRHzn6Ry6GETC1zaQqB/Wf8/i+pOs3qsuEy1ffX1qk84Mt4v1YimKN4VVxzRiX/lsLNTTMHyuCSWGSVkofGyNk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771581703; c=relaxed/simple; bh=jBiCFIM1TY02SGwb/3Blp2Q9yS47V/hSmv/Fa0fXxII=; h=Message-ID:Subject:From:To:Cc:Date:In-Reply-To:References: Content-Type:Mime-Version; b=r5JsYBuOuXoEG00CXoWOJ+zKwEX6aYbWmGAEWfu9IEKK/tI+gV0igcw15oV9qQTZv3guLgvvffn94ox1UwNdj1CfE70dc4cH05+LMaMF+MJvJhnEMb9TTolzkWqAgXMsB9xKTmeqdFnQ0IVp7A/g8cZxPVN7OMGLVCeS4YDEAW0= 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=MBJw7qDd; arc=none smtp.client-ip=209.85.214.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="MBJw7qDd" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-2a91215c158so13036625ad.0 for ; Fri, 20 Feb 2026 02:01:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1771581701; x=1772186501; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to:date :cc:to:from:subject:message-id:from:to:cc:subject:date:message-id :reply-to; bh=mZqELffXnpUaFWM6UP5mc2YGiMCwLhF/CT8oL4oYv+s=; b=MBJw7qDdKjJiQA43VxYICMohOUFF7uroWwWNZa2AH/LRcwWdNBGQCfycCawd8vfU5V KmnZfnQM4Bf9KSmR4OG9rZGlm71cApSWOcA3GeDjzJk5xlQ17lCPUy03LYHy43arfu3n vwpmymlieHiQZboVNQ8cJVZlru6Ya7x1Dt3v9ERptGMOBm4pJDpO3eGwXa6CrzjJRBfU CJD7It9SPebdCvGoNE8mOq3vV1mQjuDD7rtVWj4rW7cvSCU/sNrPIjpmLft5tvrZNzD1 +ZKm7JMmcATn2g/taF3JpTi+hR5Dw95vwK8fw3wiEmBTMgzfwMgUIngh7h/bkAhzU/25 mWLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771581701; x=1772186501; h=content-transfer-encoding:mime-version:references:in-reply-to:date :cc:to:from:subject:message-id:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mZqELffXnpUaFWM6UP5mc2YGiMCwLhF/CT8oL4oYv+s=; b=wo66467zdrlXx0UGxmUBAZxqKIGlaMGz/7H4Lae7Ecz2Tt1GIZZIJRrK1SyzYoytbK ddnO8C4oFzjqOvnARqAcr1zVMXm7rNWv88sJgSOOt9Fj5REM173qkozkzQkXP8Dt7AeH tAzjkLCl9u9Sjb+v3gc7ugmtCYd320RIEsp9VSmHhcOK2vBgHujFVoRNBpLfxAMj1Z40 DJxdKXNm5HjCYjU+AKd6rnzkXoCCOh9+tY+itx+VZS0FZR9IEmlWKnB+I50jspzkxQ0H rwZ5zenUTb8rhaE9lthFQ+UCT4x4KQtf3aSQKCJPN6xU5t8wvAVdmm4Vb4pLggltz8Co Cj/g== X-Forwarded-Encrypted: i=1; AJvYcCXDC7RfGmhXRqVVrvg9wEVv+ul+lqaG+9B1Td0we625ZscLuZCqryILkdTjYSmev2xlG2kWSgmXMWBj+Uw=@vger.kernel.org X-Gm-Message-State: AOJu0YyAD+mvM2ZMxCHJVZrHW48lSlXkiozPLx2VZ42IKQyg8VU1oOKs 8pSJTd3s7ue1ZQha3sDgwADdNkxvdliZTYUQbpH8sPPoqS3qJgp163TL X-Gm-Gg: AZuq6aIYFdSrrgGNZDZQuvje1uWW8iuWkZor5no0G1I+g/1RMPd3JjIoi2JyztY4or6 mbWfdUAqA0DVlzAScQYneTvzfDXtXrwZWAJHcIjNGPFWe3DYr1QExZJG9tY8JvWZKu427BjRnJd WogNPe2ZmFfXkqOUnyVUCureS9jz7qYqEvzDIl5VQA8BuC7xPB9bm6M8BQaBY0dzAOF8Zr9Dij+ dGpqapA4Q1wj/2ED7on104LSZfOygN546Xc3446f4JyAZYlaS3YTsjEwZFnU9aWfq5YAOVWRhbt JLdEDsot5le8dxRGER4u/KozeCOpeZLgcSfpYOsrcNz96sfI0P3nQ9As3i2yfCRH4e1slaEU438 IZ/oU0mL7sfFbQb7T2h7pHCNUSzpAZC8YLNjOCW/hifH8ltGV1momIcjcgoWjVAAe0Qsd3lPbGn tkmxsFQ00xQ0g+rsCL2GjCI1OvBYRdyzT6jvixhWoWLPs4B3vVgVRa7E1DK5X1ZDL9p4xl3C4t3 de7 X-Received: by 2002:a17:903:19eb:b0:2aa:f2f3:bcb0 with SMTP id d9443c01a7336-2ad50f9881fmr81093265ad.47.1771581701209; Fri, 20 Feb 2026 02:01:41 -0800 (PST) Received: from li-5d80d4cc-2782-11b2-a85c-bed59fe4c9e5.ibm.com ([49.207.233.114]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ad1a6fa5cbsm244689215ad.9.2026.02.20.02.01.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Feb 2026 02:01:40 -0800 (PST) Message-ID: Subject: Re: [PATCH v4] xfs: Fix error pointer dereference From: "Nirjhar Roy (IBM)" To: Ethan Tidmore , cem@kernel.org, djwong@kernel.org Cc: brauner@kernel.org, neil@brown.name, jlayton@kernel.org, amir73il@gmail.com, linux-xfs@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Date: Fri, 20 Feb 2026 15:31:35 +0530 In-Reply-To: <20260220033825.1153487-1-ethantidmore06@gmail.com> References: <20260220033825.1153487-1-ethantidmore06@gmail.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.28.5 (3.28.5-27.el8_10) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 Content-Transfer-Encoding: 7bit On Thu, 2026-02-19 at 21:38 -0600, Ethan Tidmore wrote: > The function try_lookup_noperm() can return an error pointer and is not > checked for one. > > Add checks for error pointer in xrep_adoption_check_dcache() and > xrep_adoption_zap_dcache(). > > Detected by Smatch: > fs/xfs/scrub/orphanage.c:449 xrep_adoption_check_dcache() error: > 'd_child' dereferencing possible ERR_PTR() > > fs/xfs/scrub/orphanage.c:485 xrep_adoption_zap_dcache() error: > 'd_child' dereferencing possible ERR_PTR() > > Fixes: 73597e3e42b4 ("xfs: ensure dentry consistency when the orphanage adopts a file") > Cc: # v6.16 > Signed-off-by: Ethan Tidmore > Reviewed-by: "Darrick J. Wong" > --- > v4: > - Add blank line after closing brace. > v3: > - Add dput(d_orphanage) before returning error code in > xrep_adoption_check_dcache(). > - Revert xrep_adoption_zap_dcache() change back to v1 version. > - Include function names where error pointer checks were added. > v2: > - Propagate the error back in xrep_adoption_check_dcache(). > - Add Cc to stable. > - Add correct Fixes tag. > fs/xfs/scrub/orphanage.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/fs/xfs/scrub/orphanage.c b/fs/xfs/scrub/orphanage.c > index 52a108f6d5f4..33c6db6b4498 100644 > --- a/fs/xfs/scrub/orphanage.c > +++ b/fs/xfs/scrub/orphanage.c > @@ -442,6 +442,11 @@ xrep_adoption_check_dcache( > return 0; > > d_child = try_lookup_noperm(&qname, d_orphanage); > + if (IS_ERR(d_child)) { > + dput(d_orphanage); > + return PTR_ERR(d_child); > + } > + > if (d_child) { > trace_xrep_adoption_check_child(sc->mp, d_child); > > @@ -479,7 +484,7 @@ xrep_adoption_zap_dcache( > return; > > d_child = try_lookup_noperm(&qname, d_orphanage); > - while (d_child != NULL) { > + while (!IS_ERR_OR_NULL(d_child)) { > trace_xrep_adoption_invalidate_child(sc->mp, d_child); > > ASSERT(d_is_negative(d_child)); Okay, so you sent a v4. I gave my RB in v3 - also giving it here too. Based on my reviews in the previous version[1], this looks good to me. Reviewed-by: Nirjhar Roy (IBM) [1] https://lore.kernel.org/all/61386abf00c817e65ab70c994ed584fde339f9ed.camel@gmail.com/ --NR