seq_file: fix clang warning for NULL pointer arithmetic
PATCH 1/1 seq_file: fix clang warning for NULL pointer arithmetic
From: Arnd Bergmann <[email protected]>
Clang points out that adding something to NULL is notallowed in standard C:
fs/kernfs/file.c:127:15: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
return NULL + !*ppos;
~~~~ ^
fs/seq_file.c:529:14: warning: performing pointer arithmetic on a
null pointer has undefined behavior [-Wnull-pointer-arithmetic]
return NULL + (*pos == 0);Rephrase the function to do the same thing without triggering that warning. Linux already relies on a specific binary representation of NULL, so it makes no real difference here. The instance in kernfs was copied from single_start, so fix both at once.
--- fs/kernfs/file.c | 2 +- fs/seq_file.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
fs/kernfs/file.c +1 -1
@@ -124,7 +124,7 @@ static void *kernfs_seq_start(struct seq_file *sf, loff_t *ppos)* The same behavior and code as single_open(). Returns * !NULL if pos is at the beginning; otherwise, NULL. */ -return NULL + !*ppos; +return (void *)(uintptr_t )!*ppos; } }
fs/seq_file.c +1 -1
@@ -526,7 +526,7 @@ EXPORT_SYMBOL(seq_dentry);static void *single_start (struct seq_file *p,loff_t *pos) { -return NULL + (*pos ==0 ); +return (void *)(uintptr_t )(*pos ==0 ); }static void *single_next (struct seq_file *p,void *v,loff_t *pos)
Signature · 1 line
2.27.0
Quoted 13 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
Clang points out that adding something to NULL is notallowed in standard C:
fs/kernfs/file.c:127:15: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]return NULL + !*ppos; ~~~~ ^ fs/seq_file.c:529:14: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic] return NULL + (*pos == 0);
Quoted 8 lines
Rephrase the function to do the same thing without triggering that warning. Linux already relies on a specific binary representation of NULL, so it makes no real difference here. The instance in kernfs was copied from
single_start, so fix both at once.Fixes 1da177e4c3f4 ("Linux-2.6.12-rc2")Fixes c2b19daf6760 ("sysfs, kernfs: prepare read path for kernfs")Signed-off-by Arnd Bergmann <[email protected]>
Quoted 34 lines
--- fs/kernfs/file.c | 2 +- fs/seq_file.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)fs/kernfs/file.c +1
-1@@ -124,7 +124,7 @@ static void *kernfs_seq_start(struct seq_file *sf, loff_t *ppos)* The same behavior and code as single_open(). Returns * !NULL if pos is at the beginning; otherwise, NULL. */ -return NULL + !*ppos; +return (void *)(uintptr_t )!*ppos; } }fs/seq_file.c +1
-1@@ -526,7 +526,7 @@ EXPORT_SYMBOL(seq_dentry);static void *single_start (struct seq_file *p,loff_t *pos) { -return NULL + (*pos ==0 ); +return (void *)(uintptr_t )(*pos ==0 ); }static void *single_next (struct seq_file *p,void *v,loff_t *pos)Signature · 1 line
2.27.0
fs/kernfs/file.c static void *kernfs_seq_start(struct seq_file *sf, loff_t *ppos) · line 127
Quoted 9 lines
index
f277d023ebcd..b55e6ef4d677100644fs/kernfs/file.c +1
-1@@ -124,7 +124,7 @@ static void *kernfs_seq_start(struct seq_file *sf, loff_t *ppos)* The same behavior and code as single_open(). Returns * !NULL if pos is at the beginning; otherwise, NULL. */ -return NULL + !*ppos; +return (void *)(uintptr_t )!*ppos;
Yikes. This is just horrible, why bnot the completely obvious:
if (ops->seq_start) {
...
return next;
}
if (*ppos)
return NULL;
return ppos; /* random cookie */fs/kernfs/file.c static void *kernfs_seq_start(struct seq_file *sf, loff_t *ppos) · line 130
Quoted 4 lines
fs/kernfs/file.c +1
-1static void *single_start (struct seq_file *p,loff_t *pos) { -return NULL + (*pos ==0 ); +return (void *)(uintptr_t )(*pos ==0 );
Same here.
Quoted 13 lines · Christoph Hellwig
fs/kernfs/file.c static void *kernfs_seq_start(struct seq_file *sf, loff_t *ppos) · line 127
Quoted 10 lines
index
f277d023ebcd..b55e6ef4d677100644fs/kernfs/file.c +1
-1@@ -124,7 +124,7 @@ static void *kernfs_seq_start(struct seq_file *sf, loff_t *ppos)* The same behavior and code as single_open(). Returns * !NULL if pos is at the beginning; otherwise, NULL. */ -return NULL + !*ppos; +return (void *)(uintptr_t )!*ppos;Yikes. This is just horrible, why bnot the completely obvious:
Quoted 8 lines
if (ops->seq_start) {
...
return next;
}
if (*ppos)
return NULL;
return ppos; /* random cookie */I was trying to not change the behavior, but I guess we can do better than either the original version mine. Not sure I'd call your version 'obvious' either though, at least it was immediately clear to me that returning an unrelated pointer here is the right thing to do (it works, since it is guaranteed to be neither NULL nor an error pointer and it is never dereferenced, but it's still odd).
I'd rather define something like
#define SEQ_OPEN_SINGLE (void *)1ul
and return that here. I'll send a patch doing that, let me know what you think.
Arnd