seq_file: fix clang warning for NULL pointer arithmetic
PATCH v3 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 code to be extra explicit about the valid, giving them named SEQ_OPEN_EOF and SEQ_OPEN_SINGLE definitions. The instance in kernfs was copied from single_start, so fix both at once.
---
v2: add the named macros after Christoph Hellwig pointed out that my original logic was too ugly.
Suggestions for better names welcome
v3: don't overload the NULL return, avoid ?: operator
--- fs/kernfs/file.c | 9 ++++++--- fs/seq_file.c | 5 ++++- include/linux/seq_file.h | 2 ++ 3 files changed, 12 insertions(+), 4 deletions(-)
fs/kernfs/file.c +6 -3
@@ -121,10 +121,13 @@ static void *kernfs_seq_start(struct seq_file *sf, loff_t *ppos)return next; }else {/* -* The same behavior and code as single_open(). Returns -* !NULL if pos is at the beginning; otherwise, NULL. +* The same behavior and code as single_open(). Continues +* if pos is at the beginning; otherwise, NULL. */ -return NULL + !*ppos; +if (*ppos) +return NULL ; + +return SEQ_OPEN_SINGLE ; } }
fs/seq_file.c +4 -1
@@ -526,7 +526,10 @@ EXPORT_SYMBOL(seq_dentry);static void *single_start (struct seq_file *p,loff_t *pos) { -return NULL + (*pos ==0 ); +if (*pos) +return NULL ; + +return SEQ_OPEN_SINGLE ; }static void *single_next (struct seq_file *p,void *v,loff_t *pos)
include/linux/seq_file.h +2 -0
@@ -37,6 +37,8 @@ struct seq_operations {#define SEQ_SKIP 1 +#define SEQ_OPEN_SINGLE (void *)1 +/** * seq_has_overflowed - check if the buffer has overflowed * @m: the seq_file handle
Signature · 1 line
2.27.0
Quoted 1 line
+#define
SEQ_OPEN_SINGLE(void *)1
I still think a comment explaining the magic value here would be useful.
Otherwise this looks good:
Quoted 3 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
Clang points out that adding something to NULL is notallowed
not allowed
Quoted 11 lines
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 code to be extra explicit about the valid, giving
valid what?
Quoted 7 lines
them named
SEQ_OPEN_EOFandSEQ_OPEN_SINGLEdefinitions. The instance in kernfs was copied fromsingle_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]>
Aside from the minor nits in the commit message, this should keep the same behavior while eliminating the warning and making it a little easier to understand.
Quoted 65 lines
---
v2: add the named macros after Christoph Hellwig pointed out that my original logic was too ugly.
Suggestions for better names welcomev3: don't overload the NULL return, avoid ?: operator
--- fs/kernfs/file.c | 9 ++++++--- fs/seq_file.c | 5 ++++- include/linux/seq_file.h | 2 ++ 3 files changed, 12 insertions(+), 4 deletions(-)fs/kernfs/file.c +6
-3@@ -121,10 +121,13 @@ static void *kernfs_seq_start(struct seq_file *sf, loff_t *ppos)return next; }else {/* -* The same behavior and code as single_open(). Returns -* !NULL if pos is at the beginning; otherwise, NULL. +* The same behavior and code as single_open(). Continues +* if pos is at the beginning; otherwise, NULL. */ -return NULL + !*ppos; +if (*ppos) +return NULL ; + +return SEQ_OPEN_SINGLE ; } }fs/seq_file.c +4
-1@@ -526,7 +526,10 @@ EXPORT_SYMBOL(seq_dentry);static void *single_start (struct seq_file *p,loff_t *pos) { -return NULL + (*pos ==0 ); +if (*pos) +return NULL ; + +return SEQ_OPEN_SINGLE ; }static void *single_next (struct seq_file *p,void *v,loff_t *pos)include/linux/seq_file.h +2
-0@@ -37,6 +37,8 @@ struct seq_operations {#define SEQ_SKIP 1 +#define SEQ_OPEN_SINGLE (void *)1 +/** * seq_has_overflowed - check if the buffer has overflowed * @m: the seq_file handle Signature · 1 line
2.27.0