From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qt1-f170.google.com (mail-qt1-f170.google.com [209.85.160.170]) (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 0B8D541A4F0 for ; Fri, 24 Jul 2026 22:02:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784930532; cv=none; b=Q5ThbmiCRLNt0xuaTyfzbh076Hn0/iTx3yo3qgtupjt/hNq1d/Q751pxQkeCPp+9WkdCmS4/coG51d7lAxpIgbGjiKVWIw89fpnMEOcha1RoWoGGiyn5K6g8bWVx/2vjaR7DP5st5Zl5aIrlWBhCC04ZU6kpS+gEiDrSBrjPz6w= 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.160.170 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-qt1-f170.google.com with SMTP id d75a77b69052e-51c16ac21acso6558091cf.0 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=bLoDI7Hy+TD/Kfka5rROH/L56PJc+RrTdEttrJJUbM8pS3pHyE2fVJ7q2ZHHuh4QH4 U2CxWxWvrFG/zqPtI1exE9nmXRYGRfm19jTlKrPIYmPOEA/vXeNaDQEcIdOUtMUF+2m0 CoDa4ba32LUHHQuS8dn/F7XiWoudvxoEz9l2U/PCH7J/USzaQ06PDhgvunPHk4x+9M+3 Ojc1XMWhsX7sAI/dBQAbljah6zmj62Of8rGgBLQj7z9wqnLfc7p5EDuhNnBNQ+9fw2+0 eNp4Kzd2wfAZvbVybZWvDTu0r3dehQgoT4iNmDrg/ZmqwurhoJd2IouH4KcQfgwxOILw 2wZg== X-Forwarded-Encrypted: i=1; AHgh+RrUT00bBXwFwBBOtF2FmuGYuJQBIR7TSVMNOWqsF3X0GDZ/nq/8qNtrnVmWZ88y+zzPcI1JGso=@vger.kernel.org X-Gm-Message-State: AOJu0Yz2FP3h1HgnVru+h3pwe9DfSC5OF4sjXc4hAi4hzshmfgDEKm8y lPV0gPkjonCrH/SrgF9KF7S85+5N4XVO3ub5Tn3tHkGY72hTZ1hCSXSc X-Gm-Gg: AR+sD10CO/xhBeUY5ag/3QMzq0cNkljRsJGlLDni5i090FxyuqAOjOHIJ7FWJeffmQb YMxGa+1RCoNXN8c0NQh2vAVXtLwN+9AN1ZYjTP65n7iRXWX2GQ0Fn2C2gGYJvH5mJow1Wa4wOpl IRaKgH0j/oduW6RFYw3nXh3MkTb32F/B7Hrmal+mhWT6g4EM+fvMoDk+zzAyK/3cpEk7EWOotjc 3fJmy4K9YHwerUQZPsIPmDttqhU7G0QHjkS0j1tOQTS+3sbDzWhfLyKy9TQLiplSrblJkBXbNmM txHrnXItvmRLUEnN9spCEdRUQ34pPVzHjkyLkAd0SRDD+9qKfdE98ep3iM2N15M+SLLEmH8AUS4 yjmUz2kx9R/w1VzgLW+B605lxL4lbhqWe6DwQ6iw738dd8gVCXf0Grid3Rml+O5B4+ZSehO4g2x vW3OQb8NvLqWMWDYc= 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: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 cifs_ses *ses, const struct nl goto out_free_path; } - if (ref) - rc = setup_referral(path, ce, ref, get_tgt_name(ce)); - else + if (ref) { + char *target = get_tgt_name(ce); + + if (IS_ERR(target)) { + rc = PTR_ERR(target); + goto out_unlock; + } + rc = setup_referral(path, ce, ref, target); + } else { rc = 0; + } + if (!rc && tgt_list) rc = get_targets(ce, tgt_list); +out_unlock: up_read(&htable_rw_lock); out_free_path: @@ -915,10 +924,17 @@ int dfs_cache_noreq_find(const char *path, struct dfs_info3_param *ref, goto out_unlock; } - if (ref) - rc = setup_referral(path, ce, ref, get_tgt_name(ce)); - else + if (ref) { + char *target = get_tgt_name(ce); + + if (IS_ERR(target)) { + rc = PTR_ERR(target); + goto out_unlock; + } + rc = setup_referral(path, ce, ref, target); + } else { rc = 0; + } if (!rc && tgt_list) rc = get_targets(ce, tgt_list); @@ -959,7 +975,8 @@ void dfs_cache_noreq_update_tgthint(const char *path, const struct dfs_cache_tgt t = READ_ONCE(ce->tgthint); - 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; list_for_each_entry(t, &ce->tlist, list) { -- 2.53.0