linux-kernel - [PATCH] ksmbd: Avoid duplicate source code in ksmbd_lookup_fd

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <e184fcc7-2af5-4522-9ec8-3c2e226a61f0@web.de>
Date: Sat, 4 Oct 2025 15:40:25 +0200
From: Markus Elfring <Markus.Elfring@....de>
To: linux-cifs@...r.kernel.org, Hyunchul Lee <hyc.lee@...il.com>,
 Namjae Jeon <linkinjeon@...nel.org>,
 Sergey Senozhatsky <senozhatsky@...omium.org>,
 Steve French <smfrench@...il.com>, Tom Talpey <tom@...pey.com>
Cc: LKML <linux-kernel@...r.kernel.org>, kernel-janitors@...r.kernel.org,
 Ronnie Sahlberg <lsahlber@...hat.com>, Stefan Metzmacher <metze@...ba.org>
Subject: [PATCH] ksmbd: Avoid duplicate source code in ksmbd_lookup_fd_slow()

From: Markus Elfring <elfring@...rs.sourceforge.net>
Date: Sat, 4 Oct 2025 15:30:16 +0200

Combine two condition checks into one in this function implementation
so that two statements are stored only once in the corresponding branch.

Signed-off-by: Markus Elfring <elfring@...rs.sourceforge.net>
---
 fs/smb/server/vfs_cache.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/fs/smb/server/vfs_cache.c b/fs/smb/server/vfs_cache.c
index dfed6fce8904..16b326c4ffcf 100644
--- a/fs/smb/server/vfs_cache.c
+++ b/fs/smb/server/vfs_cache.c
@@ -470,11 +470,7 @@ struct ksmbd_file *ksmbd_lookup_fd_slow(struct ksmbd_work *work, u64 id,
 	}
 
 	fp = __ksmbd_lookup_fd(&work->sess->file_table, id);
-	if (!__sanity_check(work->tcon, fp)) {
-		ksmbd_fd_put(work, fp);
-		return NULL;
-	}
-	if (fp->persistent_id != pid) {
+	if (!__sanity_check(work->tcon, fp) || fp->persistent_id != pid) {
 		ksmbd_fd_put(work, fp);
 		return NULL;
 	}
-- 
2.51.0