Skip to content

Commit 9b5c628

Browse files
committed
9p: v9fs_listxattr: fix %s null argument warning
W=1 warns about null argument to kprintf: In file included from fs/9p/xattr.c:12: In function ‘v9fs_xattr_get’, inlined from ‘v9fs_listxattr’ at fs/9p/xattr.c:142:9: include/net/9p/9p.h:55:2: error: ‘%s’ directive argument is null [-Werror=format-overflow=] 55 | _p9_debug(level, __func__, fmt, ##__VA_ARGS__) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Use an empty string instead of : - this is ok 9p-wise because p9pdu_vwritef serializes a null string and an empty string the same way (one '0' word for length) - since this degrades the print statements, add new single quotes for xattr's name delimter (Old: "file = (null)", new: "file = ''") Link: https://lore.kernel.org/r/[email protected] Suggested-by: Su Hui <[email protected]> Signed-off-by: Dominique Martinet <[email protected]> Acked-by: Christian Schoenebeck <[email protected]> Message-ID: <[email protected]>
1 parent 355f074 commit 9b5c628

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

fs/9p/xattr.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ ssize_t v9fs_xattr_get(struct dentry *dentry, const char *name,
6868
struct p9_fid *fid;
6969
int ret;
7070

71-
p9_debug(P9_DEBUG_VFS, "name = %s value_len = %zu\n",
71+
p9_debug(P9_DEBUG_VFS, "name = '%s' value_len = %zu\n",
7272
name, buffer_size);
7373
fid = v9fs_fid_lookup(dentry);
7474
if (IS_ERR(fid))
@@ -139,7 +139,8 @@ int v9fs_fid_xattr_set(struct p9_fid *fid, const char *name,
139139

140140
ssize_t v9fs_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size)
141141
{
142-
return v9fs_xattr_get(dentry, NULL, buffer, buffer_size);
142+
/* Txattrwalk with an empty string lists xattrs instead */
143+
return v9fs_xattr_get(dentry, "", buffer, buffer_size);
143144
}
144145

145146
static int v9fs_xattr_handler_get(const struct xattr_handler *handler,

net/9p/client.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1979,7 +1979,7 @@ struct p9_fid *p9_client_xattrwalk(struct p9_fid *file_fid,
19791979
goto error;
19801980
}
19811981
p9_debug(P9_DEBUG_9P,
1982-
">>> TXATTRWALK file_fid %d, attr_fid %d name %s\n",
1982+
">>> TXATTRWALK file_fid %d, attr_fid %d name '%s'\n",
19831983
file_fid->fid, attr_fid->fid, attr_name);
19841984

19851985
req = p9_client_rpc(clnt, P9_TXATTRWALK, "dds",

0 commit comments

Comments
 (0)