linux-kernel - [PATCH] fs/ncpfs: Fix a build warning when CONFIG_NCPFS

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]

Date:   Sun, 11 Sep 2016 11:49:55 +0200
From:   Borislav Petkov <bp@...en8.de>
To:     LKML <linux-kernel@...r.kernel.org>
Cc:     Petr Vandrovec <petr@...drovec.name>,
        Al Viro <viro@...iv.linux.org.uk>
Subject: [PATCH] fs/ncpfs: Fix a build warning when CONFIG_NCPFS_NLS is not set

From: Borislav Petkov <bp@...e.de>

I get this when doing randconfig builds:

  fs/ncpfs/dir.c: In function ‘ncp_hash_dentry’:
  fs/ncpfs/dir.c:136:23: warning: unused variable ‘sb’ [-Wunused-variable]
     struct super_block *sb = dentry->d_sb;

because NCP_IO_TABLE macro is NULL in the !CONFIG_NCPFS_NLS case and @sb
remains unused then.

Sticking it into the macro directly takes care of the warning and the
code is still readable. :)

Signed-off-by: Borislav Petkov <bp@...e.de>
Cc: Petr Vandrovec <petr@...drovec.name>
Cc: Al Viro <viro@...iv.linux.org.uk>
---
 fs/ncpfs/dir.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fs/ncpfs/dir.c b/fs/ncpfs/dir.c
index 17de5c13dfae..f5b594e2457c 100644
--- a/fs/ncpfs/dir.c
+++ b/fs/ncpfs/dir.c
@@ -133,12 +133,11 @@ ncp_hash_dentry(const struct dentry *dentry, struct qstr *this)
 		return 0;
 
 	if (!ncp_case_sensitive(inode)) {
-		struct super_block *sb = dentry->d_sb;
 		struct nls_table *t;
 		unsigned long hash;
 		int i;
 
-		t = NCP_IO_TABLE(sb);
+		t = NCP_IO_TABLE(dentry->d_sb);
 		hash = init_name_hash(dentry);
 		for (i=0; i<this->len ; i++)
 			hash = partial_name_hash(ncp_tolower(t, this->name[i]),
-- 
2.10.0