seq_file: fix clang warning for NULL pointer arithmetic
PATCH v4 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 not allowed 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.
Fixes 1da177e4c3f4 ("Linux-2.6.12-rc2")
Fixes c2b19daf6760 ("sysfs, kernfs: prepare read path for kernfs")
Reviewed-by Christoph Hellwig <[email protected]>
Reviewed-by Nathan Chancellor <[email protected]>
Signed-off-by Arnd Bergmann <[email protected]>
---
v2: add the named macros after Christoph Hellwig pointed out
that my original logic was too ugly.
v3: don't overload the NULL return, avoid ?: operator
v4: fix changelog text (Nathan Chancellor), add comment (Christoph
Hellwig)
--- fs/kernfs/file.c | 9 ++++++--- fs/seq_file.c | 5 ++++- include/linux/seq_file.h | 6 ++++++ 3 files changed, 16 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 +6 -0
@@ -37,6 +37,12 @@ struct seq_operations {#define SEQ_SKIP 1 +/* +* op->start must return a non-NULL pointer for single_open(), +* this is used when we don't care about the specific value. +*/ +#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