Skip to contentSkip to conversation

nfsd4: fix printk format string in nfsd4_open

PATCH In review Benny Halevy 3 participants 4 messages Dec 9, 2013 – Dec 13, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nfsd4: fix printk format string in nfsd4_open

---
 fs/nfsd/nfs4proc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfsd/nfs4proc.c +1 -1
index 0a964f1..8624bee 100644
@@ -361,7 +361,7 @@ nfsd4_open(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
 	struct net *net = SVC_NET(rqstp);
 	struct nfsd_net *nn = net_generic(net, nfsd_net_id);
 
-	dprintk("NFSD: nfsd4_open filename %.*s op_openowner %p\n",
+	dprintk("NFSD: nfsd4_open filename %*s op_openowner %p\n",
 		(int)open->op_fname.len, open->op_fname.data,
 		open->op_openowner);
 
Signature · 1 line
1.8.3.1
#1 lore raw
Quoted 1 line · Benny Halevy

Are you sure? Reminding myself from the sprintf man page.... %*s provides padding, %.*s limits the number of characters taken from the string. We need that limit since there's no guarantee of null termination here.

--b.

Quoted 20 lines
---
 fs/nfsd/nfs4proc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfsd/nfs4proc.c +1 -1
index 0a964f1..8624bee 100644
@@ -361,7 +361,7 @@ nfsd4_open(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
 	struct net *net = SVC_NET(rqstp);
 	struct nfsd_net *nn = net_generic(net, nfsd_net_id);
 
-	dprintk("NFSD: nfsd4_open filename %.*s op_openowner %p\n",
+	dprintk("NFSD: nfsd4_open filename %*s op_openowner %p\n",
 		(int)open->op_fname.len, open->op_fname.data,
 		open->op_openowner);
 
Signature · 1 line
1.8.3.1
#2 lore raw
Quoted 7 lines · J. Bruce Fields
Quoted 1 line · Benny Halevy

Are you sure? Reminding myself from the sprintf man page.... %*s provides padding, %.*s limits the number of characters taken from the string. We need that limit since there's no guarantee of null termination here.

Well, the .* format doesn't seem to be supported in the kernel library as far as I could tell. At least it doesn't work for me. We may need to copy the string and null terminate it if it's indeed the case.

Benny

Quoted 23 lines

--b.

Quoted 20 lines
---
 fs/nfsd/nfs4proc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfsd/nfs4proc.c +1 -1
index 0a964f1..8624bee 100644
@@ -361,7 +361,7 @@ nfsd4_open(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
 	struct net *net = SVC_NET(rqstp);
 	struct nfsd_net *nn = net_generic(net, nfsd_net_id);
 
-	dprintk("NFSD: nfsd4_open filename %.*s op_openowner %p\n",
+	dprintk("NFSD: nfsd4_open filename %*s op_openowner %p\n",
 		(int)open->op_fname.len, open->op_fname.data,
 		open->op_openowner);
 
Signature · 1 line
1.8.3.1
#3 lore raw

Benny Halevy wrote:

Quoted 7 lines · J. Bruce Fields
Quoted 1 line · Benny Halevy

Are you sure? Reminding myself from the sprintf man page.... %*s provides padding, %.*s limits the number of characters taken from the string. We need that limit since there's no guarantee of null termination here.

Well, the .* format doesn't seem to be supported in the kernel library as far as I could tell. At least it doesn't work for me. We may need to copy the string and null terminate it if it's indeed the case.

There's nothing about strings in Documentation/printk-formats.txt, but if you look at lib/vsprintf.c, it's clearly trying to support precision. The precision is parsed in format_decode(), and used to limit the string length in string().

String precision is used other places in the kernel, too:
% fgrep -l '%.*s' {kernel,fs}/*.c kernel/hung_task.c
kernel/lockdep.c
fs/dcache.c
fs/filesystems.c

So I would be surprised if it doesn't work.