Patch "9p: v9fs_listxattr: fix %s null argument warning" has been added to the 5.15-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

    9p: v9fs_listxattr: fix %s null argument warning

to the 5.15-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     9p-v9fs_listxattr-fix-s-null-argument-warning.patch
and it can be found in the queue-5.15 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit c8a1e55f2607ab4c43da46f79ddadd86923bd6ef
Author: Dominique Martinet <asmadeus@xxxxxxxxxxxxx>
Date:   Wed Oct 25 19:34:44 2023 +0900

    9p: v9fs_listxattr: fix %s null argument warning
    
    [ Upstream commit 9b5c6281838fc84683dd99b47302d81fce399918 ]
    
    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/20231008060138.517057-1-suhui@xxxxxxxxxxxx
    Suggested-by: Su Hui <suhui@xxxxxxxxxxxx>
    Signed-off-by: Dominique Martinet <asmadeus@xxxxxxxxxxxxx>
    Acked-by: Christian Schoenebeck <linux_oss@xxxxxxxxxxxxx>
    Message-ID: <20231025103445.1248103-2-asmadeus@xxxxxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/fs/9p/xattr.c b/fs/9p/xattr.c
index ee331845e2c7a..31799ac10e33a 100644
--- a/fs/9p/xattr.c
+++ b/fs/9p/xattr.c
@@ -73,7 +73,7 @@ ssize_t v9fs_xattr_get(struct dentry *dentry, const char *name,
 	struct p9_fid *fid;
 	int ret;
 
-	p9_debug(P9_DEBUG_VFS, "name = %s value_len = %zu\n",
+	p9_debug(P9_DEBUG_VFS, "name = '%s' value_len = %zu\n",
 		 name, buffer_size);
 	fid = v9fs_fid_lookup(dentry);
 	if (IS_ERR(fid))
@@ -144,7 +144,8 @@ int v9fs_fid_xattr_set(struct p9_fid *fid, const char *name,
 
 ssize_t v9fs_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size)
 {
-	return v9fs_xattr_get(dentry, NULL, buffer, buffer_size);
+	/* Txattrwalk with an empty string lists xattrs instead */
+	return v9fs_xattr_get(dentry, "", buffer, buffer_size);
 }
 
 static int v9fs_xattr_handler_get(const struct xattr_handler *handler,
diff --git a/net/9p/client.c b/net/9p/client.c
index 9fdcaa956c008..ead458486fdcf 100644
--- a/net/9p/client.c
+++ b/net/9p/client.c
@@ -2020,7 +2020,7 @@ struct p9_fid *p9_client_xattrwalk(struct p9_fid *file_fid,
 		goto error;
 	}
 	p9_debug(P9_DEBUG_9P,
-		 ">>> TXATTRWALK file_fid %d, attr_fid %d name %s\n",
+		 ">>> TXATTRWALK file_fid %d, attr_fid %d name '%s'\n",
 		 file_fid->fid, attr_fid->fid, attr_name);
 
 	req = p9_client_rpc(clnt, P9_TXATTRWALK, "dds",



[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux