From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oa1-f41.google.com (mail-oa1-f41.google.com [209.85.160.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 E834439E6FC for ; Wed, 26 Aug 2026 19:10:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787771468; cv=none; b=trUf54k27mKEUbQLZ9/pvlDF2rErKWbJDLo7gld+VZACKuompbNJStDLCWUpeALhzIZXJb01JmJfQhd+vn4Pd7dAjV3Plb6R9tXT+p9GstDUfA7CBIRkiIN3/KhXolW56bJFZ1oAV34a3xteZI9eWlJXmqEd5H8KOu53Jvcvhg8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787771468; c=relaxed/simple; bh=kMutbCctvKI2ONfbZdpKGilOJVQLCwIgirUBy4IWnBQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=s/u47b6u24MDUaxi1dDSCue8O30UcpVSD8OqKBnP1x6HGQz1t52F2ila73JNTgIlO76nwVVpgCXtJVZIK0PsFMDFkdwU1SSICTOd3BqEE4zJUBYsscdyWYS9M+bGuDodPyzkq1l318Yxk9NMX6FvzrRWZul6HNt2iCBOTyzzbfU= 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=H1JIJ0KA; arc=none smtp.client-ip=209.85.160.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="H1JIJ0KA" Received: by mail-oa1-f41.google.com with SMTP id 586e51a60fabf-4563ac048f4so1625399fac.0 for ; Wed, 26 Aug 2026 12:10:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1787771454; x=1788376254; 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=wr7Kgi4pJ8f9GYLacdQizDaUoUly/2NGcfgRTpFBAes=; b=H1JIJ0KATwJ/MG4jCa4tOeoxOsgRhr4eKziXcoE6fUeW1Umo6ZoSbbllnE3KS/4xDl +rpgbxzlTLcDXH4hHPCJBDC3EYKM2sFF/p12FrJsixk0VGz0guBp0bOVvmPUrnMOakiT 8hGaL6hHmb1W9UyX78cz+pgkc0SmYQT/1zsJIHKcur7Lq79vLwrIqE39U4SPryyUJZCY YxnDCk7HVm6qfXDZY6Bw5dY7Wq6+Von8gAZrYRcyIqYqdIo35icVTJKSfur4RVfiV583 gtvFm4MDCjo/9RJDd6RPjNC328WvCDKDazWO3vzxGuULsMStAZtqjCB0HN0DAtm58zac wxUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787771454; x=1788376254; 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=wr7Kgi4pJ8f9GYLacdQizDaUoUly/2NGcfgRTpFBAes=; b=PgXFLVq1SsQpyZwPIQ00bZ1vIU82ctzCRz9UI4iEVGS8tjVIRhl0e6izGF3fKNrmSV uR6elwG0xtfG8L77mkv/5HBdApkc+eG7gJpMmMfjmHVynT6lGEMAgNKNhRTF0a+jpsog IqcPKmf0TgC3hjLs44Ldt4Df293EXEwQsuorAkUFTxXdYu7wCMCOmlHXyKQfS+Qrx8v2 EcfM+j1wk8aIOxItt4gdl1M9VG5Asci4RtQ9w5ZwbrECrYTB1U5TxgURVHIni4y+XDNy XTdqCyhQMipvdsC0kNTiYCycZT7lKcPMysmyM20u5/UTGUTXcWe248Di96d2jMrqXPpl PKuQ== X-Forwarded-Encrypted: i=1; AHgh+Ro3UYJYFQVKSoVdijrwB3rMPxHUG28NUeQhDxLm1dABn2qqM+2zbAZwKbMZDrAn9flU8Rwuur0IxfWd@vger.kernel.org X-Gm-Message-State: AFuF++mHw3m0nSJ+iji6TRDfMcOg4lssxQJZeXW7RN3qFm53Sz41s7f9 thNF/9rwcltdUheGpVRTiA0XOv4fjDFPmT5UOmnIhTDd6j7/hKSYTg0Y X-Gm-Gg: AR+sD10gxTKYCY7vOtbsszrMjFGu6h3oYh1SqEzd75Fz/QwgYcbQV1H7sTHbBz5uPaZ pBB3mmzdskAQPKIbWb88ej8FVxIW/vMhWq1LJnD9+bIV2bSApTtBxaKiFx66o84wbhyMXC+Vyds DdX0OfF9VG5jf/QCPYzBHe6Yhoe3vfBL/iNGK8ymVIdgcc05XaOuSu2Q+z6kSn+wjFjpx5gn9H0 8Xvc0iPPTEwbml6tt7KaiMwA9GMrq4UA9TIPzc72vUFd/rmlThzRP7ZHHZuxvWxkfYAQYsWnSIz t/LkzuPpgMeXkgFoICj0mAGm3P+4dGJ/LOhD9s0zvHzC98uFhuiVWRdBAB0FGmuoL9hDYY3IiAv rR0tlguVcbcsrOrsGEMWkjGE9kNtD1Nz6at942Crsr0OS3u8iWZikXvTnSVUEadkjr9LBgBgQGJ e7EGODQEUxAfA/+WC9prVRENwWW4pl/VShFS3G2e+Vsn22yyOCT7zn+zWpYndNJMxtVicBeSGQ1 4kTVC6bI8uQaxo= X-Received: by 2002:a05:6870:3190:b0:45e:2de4:95f1 with SMTP id 586e51a60fabf-46597c39c1dmr10876532fac.2.1787771453791; Wed, 26 Aug 2026 12:10:53 -0700 (PDT) Received: from FredPC.lan ([2600:382:3107:46eb:31a7:8fef:9fc6:7e8b]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-465ad9ecc2fsm3060369fac.4.2026.08.26.12.10.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Aug 2026 12:10:53 -0700 (PDT) From: Fredric Cover To: Paulo Alcantara , Namjae Jeon Cc: ChenXiaoSong , Tom Talpey , Ronnie Sahlberg , Shyam Prasad N , Bharath SM , linux-cifs@vger.kernel.org, linux-kernel@vger.kernel.org, Fredric Cover Subject: [PATCH 1/2] smb: client: fill cache fields after populating cache in copy_ref_data() Date: Wed, 26 Aug 2026 12:10:32 -0700 Message-ID: <20260826191033.162320-2-fredric.cover.lkernel@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260826191033.162320-1-fredric.cover.lkernel@gmail.com> References: <20260826191033.162320-1-fredric.cover.lkernel@gmail.com> Precedence: bulk X-Mailing-List: linux-cifs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit In copy_ref_data(), struct cache_entry *ce has its fields populated at the beginning of the function. Later, if alloc_target fails with an ERR_PTR, free_tgts() is called on the cache, leaving the cache metadata populated without any targets. Critically, this extends ce->etime, making the cache appear valid for longer without any targets. Also, free_tgts() does not set ce->numtgts to zero. On error, when the cache is freed, ce->numtgts is not zeroed, and other cache users may attempt to access nonexistent entries. Update fields after copying targets to prevent partial-state updates. Set ce->numtgts to zero at the end of free_tgts(). Signed-off-by: Fredric Cover --- fs/smb/client/dfs_cache.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/fs/smb/client/dfs_cache.c b/fs/smb/client/dfs_cache.c index 86dba25b7a5a..b0388c460499 100644 --- a/fs/smb/client/dfs_cache.c +++ b/fs/smb/client/dfs_cache.c @@ -123,6 +123,7 @@ static inline void free_tgts(struct cache_entry *ce) kfree(t); } + ce->numtgts = 0; WRITE_ONCE(ce->tgthint, NULL); } @@ -388,13 +389,6 @@ static int copy_ref_data(const struct dfs_info3_param *refs, int numrefs, struct cache_dfs_tgt *target; int i; - ce->ttl = max_t(int, refs[0].ttl, CACHE_MIN_TTL); - ce->etime = get_expire_time(ce->ttl); - ce->srvtype = refs[0].server_type; - ce->hdr_flags = refs[0].flags; - ce->ref_flags = refs[0].ref_flag; - ce->path_consumed = refs[0].path_consumed; - for (i = 0; i < numrefs; i++) { struct cache_dfs_tgt *t; @@ -409,12 +403,19 @@ static int copy_ref_data(const struct dfs_info3_param *refs, int numrefs, } else { list_add_tail(&t->list, &ce->tlist); } - ce->numtgts++; } target = list_first_entry_or_null(&ce->tlist, struct cache_dfs_tgt, list); + WRITE_ONCE(ce->tgthint, target); + ce->ttl = max_t(int, refs[0].ttl, CACHE_MIN_TTL); + ce->etime = get_expire_time(ce->ttl); + ce->srvtype = refs[0].server_type; + ce->hdr_flags = refs[0].flags; + ce->ref_flags = refs[0].ref_flag; + ce->path_consumed = refs[0].path_consumed; + ce->numtgts = numrefs; return 0; } -- 2.53.0