From nobody Sat Jul 25 05:59:33 2026 Received: from mail-qv1-f41.google.com (mail-qv1-f41.google.com [209.85.219.41]) (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 1C26141A50E for ; Fri, 24 Jul 2026 22:02:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784930532; cv=none; b=ZTCvdISWJxBZqK3QtEa1peIvMvxndtPoBo/2YvO2BAIqKv4jOf+kUiqkNnldWHraY4O9PxxgCRhVpoFZEF2lJyPGqrA+mUJvFr/gz61+R9Nx0sDSoDGFfjGC9Lt2wjZJNQdWgKbstonRfrwiu1hnegC3q5PmUNI19VZi3EWJL1g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784930532; c=relaxed/simple; bh=6pLnwWeKSASc1379eeY67KlKjOo0bUXxMmQCpFnyiD8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uFyq7VlrpIxjsVwsNhf3XN/+LHcZhccAU9acScDAmpBKW+RDR1TM+oUgFkgiSAK7uu+xDHEz0NjHlHSHQQRgaKjzOWhOGXOBsd2nsc3pVzMxuduwqT9762Mssr90r46kyqujlDaCk+AR1MftoubbzbsqT5NUfi029sIr8tTBZzA= 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=dqKXQ1IP; arc=none smtp.client-ip=209.85.219.41 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="dqKXQ1IP" Received: by mail-qv1-f41.google.com with SMTP id 6a1803df08f44-8efec2c28f8so6159826d6.2 for ; Fri, 24 Jul 2026 15:02:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784930530; x=1785535330; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=42dslX+jW/ktUVa63IhDYJMEcXLz+OxoplxTRWEwi+g=; b=dqKXQ1IPUCz9QoOEvRBXZwox5XzLKbUqbOuOqJOOXxZAUVVA7vrNk35La9Vw/tDMgO TSfY9Ijs8ehYuWfXMeLb6//WCNMI6IdZ6maNGceLUNGnJwdBK0bP91wl6AdnUpZb+iPQ NhlGdCsviHqeKQcRmdwk6fdp+N1giLxjIrOK4l8bQynOdeLdO9E0UcFptFFK/vjaqh6r knJcrcteZJCGf1ybbnH4CseJiQAaJcFFBKfBiR55grM9r0A/Iubvd4s5iMXLfibG6pWs HdPZrXB6VtQeP5C78KFDFUuCn/6C+e37iJ9K4dvAdpLAbtVY8nnF4Tp7BbXYDB2/oAxO wu3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784930530; x=1785535330; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=42dslX+jW/ktUVa63IhDYJMEcXLz+OxoplxTRWEwi+g=; b=A1XtWf/xHOPubIeB+B4Sfzt1afHVrulP5qKBxLAp7Ecq3R4KVHK1rkK0HB9pnY7xKE /Etqds031xtAwtPDWXX436vwIr4KYxUqDRGkmSpVZVhFixRU945McFi0kUDftQDsk6i6 wvaidaplqrTLBRIKFKhjvhHngWjA9X4bV9BgfVZIFA+v0vXfLG+BEIrLr5PBWloJ3A/F Mr843snPy5qISGF40/bpk2CJU2tuUNdtg/jAGYOZZ/K8NSvJ5l/pABXfUrhSJdG0zV3h EYz+Dac/IVijrkaGR75eVp+U9T5eIJZ1JFCJsnjK0K/ydu48rNy8JOWc62Zb/mboOBaL MYTg== X-Forwarded-Encrypted: i=1; AHgh+RorTALYc764S7/2wNUsd+nx/WLoLXKy9McqTROQrPLWHSxPEENUGP2tAC01ST0okc//XBV1H+NubHks6ec=@vger.kernel.org X-Gm-Message-State: AOJu0Yzh+3Pnkx0+Emx2b/9dyt7Gv4EeLXQ8/g6ZAvhQwqU8Oxi5BON/ NTg6Ed4VUR5OfAjujf8hI536xA1JsAR0P5eIuF0lq6TlDZR0kUqrsLBP X-Gm-Gg: AR+sD1247OFYLjsqJyLpXc14vUN5gU/t1o6jccCYBB8THBi8+EOpnjcQT3GMyiBNiut XENlUH4Lq2m86aYBk7o8ksZ+AgWIiKUJmuukVhvjDyQCxE6wwygtDuNxznFCId6EhqKaNMZ0/+z hxpB/FD8GUDkhs+rJSGvoslofBO2qHB79WgWhl887MrXC8VuHHVsOENZHLUb2pJso71dppxjxCK t2StG6F5SN5cBPUJ93JcoRvLTsQWGDrwvebYLL/idUMj23s5GTl+T2GouoAaxRwiasanL2P7pBW snTsYdW47FAza6JrfFGjliXvHUyYR548HPIqrTvE1PWoi2jtV1Ph+B3cg0NwcTFJ0aEkZ3e9C6I HUjj8LpwJdq0IR0SxEJQenmWAiEkAQOuKYmYHwiIWWT43V1MZUOOnq9lPiQQEgaJdkD5SkXpnav X4yP/SUKrOL/lZado= X-Received: by 2002:ac8:5cc3:0:b0:51c:849e:e222 with SMTP id d75a77b69052e-529a8623877mr1752841cf.36.1784930529916; Fri, 24 Jul 2026 15:02:09 -0700 (PDT) Received: from FredPC.lan ([2600:382:311b:26:c204:8bd0:9563:8b5f]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-529a27f68f3sm8668631cf.9.2026.07.24.15.02.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2026 15:02:09 -0700 (PDT) From: Fredric Cover To: sfrench@samba.org Cc: pc@manguebit.org, ronniesahlberg@gmail.com, sprasad@microsoft.com, tom@talpey.com, bharathsm@microsoft.com, linux-cifs@vger.kernel.org, linux-kernel@vger.kernel.org, Fredric Cover , stable@vger.kernel.org Subject: [PATCH v3 1/2] smb: client: harden DFS cache against invalid target hints Date: Fri, 24 Jul 2026 15:01:45 -0700 Message-ID: <20260724220146.1859170-2-fredric.cover.lkernel@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260724220146.1859170-1-fredric.cover.lkernel@gmail.com> References: <20260724023539.1596955-1-fredric.cover.lkernel@gmail.com> <20260724220146.1859170-1-fredric.cover.lkernel@gmail.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 Content-Type: text/plain; charset="utf-8" Currently, get_tgt_name() returns ERR_PTR(-ENOENT) when ce->tgthint is NULL, and dfs_cache_noreq_update_tgthint() assumes ce->tgthint is always valid. In preparation for clearing ce->tgthint in free_tgts(), harden callers of get_tgt_name() against ERR_PTR results and harden dfs_cache_noreq_update_tgthint() against NULL pointer dereferences. Cc: stable@vger.kernel.org Signed-off-by: Fredric Cover --- fs/smb/client/dfs_cache.c | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/fs/smb/client/dfs_cache.c b/fs/smb/client/dfs_cache.c index 8cd93cd2f00f..c9ace4326a35 100644 --- a/fs/smb/client/dfs_cache.c +++ b/fs/smb/client/dfs_cache.c @@ -869,13 +869,22 @@ int dfs_cache_find(const unsigned int xid, struct cif= s_ses *ses, const struct nl goto out_free_path; } =20 - if (ref) - rc =3D setup_referral(path, ce, ref, get_tgt_name(ce)); - else + if (ref) { + char *target =3D get_tgt_name(ce); + + if (IS_ERR(target)) { + rc =3D PTR_ERR(target); + goto out_unlock; + } + rc =3D setup_referral(path, ce, ref, target); + } else { rc =3D 0; + } + if (!rc && tgt_list) rc =3D get_targets(ce, tgt_list); =20 +out_unlock: up_read(&htable_rw_lock); =20 out_free_path: @@ -915,10 +924,17 @@ int dfs_cache_noreq_find(const char *path, struct dfs= _info3_param *ref, goto out_unlock; } =20 - if (ref) - rc =3D setup_referral(path, ce, ref, get_tgt_name(ce)); - else + if (ref) { + char *target =3D get_tgt_name(ce); + + if (IS_ERR(target)) { + rc =3D PTR_ERR(target); + goto out_unlock; + } + rc =3D setup_referral(path, ce, ref, target); + } else { rc =3D 0; + } if (!rc && tgt_list) rc =3D get_targets(ce, tgt_list); =20 @@ -959,7 +975,8 @@ void dfs_cache_noreq_update_tgthint(const char *path, c= onst struct dfs_cache_tgt =20 t =3D READ_ONCE(ce->tgthint); =20 - if (unlikely(!strcasecmp(it->it_name, t->name))) + /* Check 't' in case ce->tgthint was cleared by free_tgts() */ + if (t && unlikely(!strcasecmp(it->it_name, t->name))) goto out_unlock; =20 list_for_each_entry(t, &ce->tlist, list) { --=20 2.53.0 From nobody Sat Jul 25 05:59:33 2026 Received: from mail-qt1-f171.google.com (mail-qt1-f171.google.com [209.85.160.171]) (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 A57AB40F752 for ; Fri, 24 Jul 2026 22:02:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784930537; cv=none; b=MaFOs6mapQ1/BLl2EgjhGkKGv/Br2xSeF8KL9fmL4oPL5fWNxRysPPwEBkgMg3fdmNBkb7mJ6Wbhq2UjKB3ogUQkYhXn9m+YEFUOfW/QymykdQ6xEqAq6czmSderdbt6TPLHJ3GO8l0imXo+dRufgUZ1fKyTXMrBjECBTS1U5Xg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784930537; c=relaxed/simple; bh=JOTMTHvNXNnDMv8cbytpWkBwOfL6IylIUcituYRfXKQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ul9yCzPpw5OxaOTlv0cv0oekqfDzeY8oMjT+Ad5R8btXf3iBJcPxa6Ie1+VXEwrfOnRY3qqQe2Q3uO0NaohhEylCBikxcIzsmD5BOie1QAerlPMYDgE35cQNI956YDK0LNUYG++//FMYcUhgCDtyHaGMbOB8cke7ZFOAigWJK+s= 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=Gd7CVZgy; arc=none smtp.client-ip=209.85.160.171 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="Gd7CVZgy" Received: by mail-qt1-f171.google.com with SMTP id d75a77b69052e-51c149c5722so9578391cf.0 for ; Fri, 24 Jul 2026 15:02:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784930534; x=1785535334; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=P1VNwYcQpb9WDj6KVSyLpNd/oPBMCMFNw+HEtq66+P0=; b=Gd7CVZgyCqObZMuSxTfhDA93XhEUZi+I0GAWp7DQCT++bxrPkJsSFhSzU2UYmFoAYP o8uM33LxEemyXTm2fjLDUvvBtg8mFB966x7y3+FW/xxhuU8fqUHh1krozohDx97u96RW kTlE35fx33BM6bbTSAZlU92ae/UmH9nB/9G5BAiwk/knXPSu5TATrAwP6pT6NoPggK4l D3zTq1t5Jd8n6UbRqNKlDH1qzeqL7eAOCJthE5pxIK4vLnt0sZD9um4dFgPiQtiBpPaM ms3+1F8u3gD/UH6nXVXUAfAcfWsMpMkthVMLMP4pD9awk2pQe/waB7l6H62ftkSBSbXW nKlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784930534; x=1785535334; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=P1VNwYcQpb9WDj6KVSyLpNd/oPBMCMFNw+HEtq66+P0=; b=ZP8rrZjg8l53PQxVVXEp1zaSxrM6jPdcaCkCAPeTr1aIwf0eY0659gWV2LR/0yR1Qd jHY4GPTlKMex8kWKXpXSx9caP6dqmEoWAjO2X/lssAVs/rZRcM5Q1ZYSH6iTbtP8RMm3 sFy9FlwM8P9phqhtAwX6O1yxfpPkMajeAWplBxqILG1Si3b0Hy7d1IecBuCj7tnd7ldh uW+Em+UsAh22sRYc0ERmW86uET7whV5RsX63LP8pbCHmNzQBGaglqJp9QKeeCmcBBUyv ibUlTfPmuCrVAz584jVEL/kFTWUdESv8RxmlXoJJIXav+41j1YHfBM1YCOx+PXcR+HXQ qjNA== X-Forwarded-Encrypted: i=1; AHgh+Rp6yxH5xjDt3kCqv92zJW6lbpSM5dWB9HPxPHU5d9ysBxCOH4BzycEKPCLLRLeq7mGHiBudPTE49PPoMVc=@vger.kernel.org X-Gm-Message-State: AOJu0YxYX4aFpWh6CTfm1cYf4FCHhqfIQt60Cp1bhUt2+eZOG5DM8WHk 6eijwH1TWg1PnyzP8uqTf/3+3Xm/YT03Lr7CJ5Zh9cW0XJSumhqUK/7+ X-Gm-Gg: AR+sD11tXG7xxkldDxKEe8GdeJ5TCdk9xgrzX75aii+ld/448ByLX0dvYnqVXcnc5Ye OHqHPft2ykpRDlcaYvd927FCdtEiuLLcqiYgrNemNRFX2sWIwHaBco6QxgOqR/1iUG0ojHB/uc5 55jYd7SX9b5vi0wb6Hh01SWRdDbg9Z2XKW11Mj9W9a98EzTiO2vwrg35ImWAIKI9YLBo9Ryv2Db Ic9Eps0nkCUOO6clDCXoPYMJRJHrVqZdWe60OLP48Ad2p77V7X2OyGUnoloD46mypo4oRx/bWMp f5qbV9I4yDjRiacKeoaob3w/530sMzd0pD7ylwuUHLO8SkLr8oh8KBfu5NgiqroDEKI/mhxDWRA yg92ecI1/SoRuY+WQwbbYtQ2Qr2LaGM7hkHFhAXOA/i7VCnjRtU/AQW2uQJbH18iDg/ZJ+9Z2dB ijQf2xW+Y8ojLFMmQ= X-Received: by 2002:a05:622a:2614:b0:51b:feb2:3827 with SMTP id d75a77b69052e-5295f32b6a5mr29099041cf.32.1784930534076; Fri, 24 Jul 2026 15:02:14 -0700 (PDT) Received: from FredPC.lan ([2600:382:311b:26:c204:8bd0:9563:8b5f]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-529a27f68f3sm8668631cf.9.2026.07.24.15.02.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2026 15:02:13 -0700 (PDT) From: Fredric Cover To: sfrench@samba.org Cc: pc@manguebit.org, ronniesahlberg@gmail.com, sprasad@microsoft.com, tom@talpey.com, bharathsm@microsoft.com, linux-cifs@vger.kernel.org, linux-kernel@vger.kernel.org, Fredric Cover , stable@vger.kernel.org Subject: [PATCH v3 2/2] smb: client: clear ce->tgthint in free_tgts() Date: Fri, 24 Jul 2026 15:01:46 -0700 Message-ID: <20260724220146.1859170-3-fredric.cover.lkernel@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260724220146.1859170-1-fredric.cover.lkernel@gmail.com> References: <20260724023539.1596955-1-fredric.cover.lkernel@gmail.com> <20260724220146.1859170-1-fredric.cover.lkernel@gmail.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 Content-Type: text/plain; charset="utf-8" When free_tgts() frees all structures in ce->tlist, ce->tgthint is left pointing to one of the freed cache_dfs_tgt structures. If ce->tgthint is not reset before it is used later, it results in a use-after-free. Set ce->tgthint to NULL in free_tgts() after the elements are freed to reflect that no elements remain. Fixes: 54be1f6c1c37 ("cifs: Add DFS cache routines") Cc: stable@vger.kernel.org # depends on: smb: client: harden DFS cache agai= nst invalid target hints Signed-off-by: Fredric Cover --- fs/smb/client/dfs_cache.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/smb/client/dfs_cache.c b/fs/smb/client/dfs_cache.c index c9ace4326a35..86dba25b7a5a 100644 --- a/fs/smb/client/dfs_cache.c +++ b/fs/smb/client/dfs_cache.c @@ -122,6 +122,8 @@ static inline void free_tgts(struct cache_entry *ce) kfree(t->name); kfree(t); } + + WRITE_ONCE(ce->tgthint, NULL); } =20 static inline void flush_cache_ent(struct cache_entry *ce) --=20 2.53.0