net: atm: Use IS_ENABLED in atm_dev_ioctl
Subsystems (3)
PATCH 1/1 net: atm: Use IS_ENABLED in atm_dev_ioctl
When building with -Wsometimes-uninitialized, Clang warns:
net/atm/resources.c:256:6: warning: variable 'number' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized] net/atm/resources.c:212:7: warning: variable 'iobuf_len' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized]
Clang won't realize that compat is 0 when CONFIG_COMPAT is not set until the constant folding stage, which happens after this semantic analysis. Use IS_ENABLED instead so that the zero is present at the semantic analysis stage, which eliminates this warning.
---
I don't think this looks the greatest because of the IS_ENABLED + #ifdef but the only other solution I could think of looks way uglier to me:
https://gist.github.com/74650e9139f704a5435f82fc80d59969
net/atm/resources.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
net/atm/resources.c +2 -6
@@ -203,13 +203,9 @@ int atm_dev_ioctl(unsigned int cmd, void __user *arg, int compat)int __user *sioc_len;int __user *iobuf_len; -#ifndef CONFIG_COMPAT - compat =0 ;/* Just so the compiler _knows_ */ -#endif -switch (cmd) {case ATM_GETNAMES : -if (compat) { +if (IS_ENABLED (CONFIG_COMPAT ) && compat) {#ifdef CONFIG_COMPAT struct compat_atm_iobuf __user *ciobuf = arg;compat_uptr_t cbuf;
@@ -253,7 +249,7 @@ int atm_dev_ioctl(unsigned int cmd, void __user *arg, int compat)break ; } -if (compat) { +if (IS_ENABLED (CONFIG_COMPAT ) && compat) {#ifdef CONFIG_COMPAT struct compat_atmif_sioc __user *csioc = arg;compat_uptr_t carg;
Signature · 1 line
2.21.0
From: Nathan Chancellor <[email protected]>
Date: Thu, 7 Mar 2019 09:57:42 -0700
Quoted 5 lines
When building with -Wsometimes-uninitialized, Clang warns:
net/atm/resources.c:256:6: warning: variable 'number' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized]net/atm/resources.c:212:7: warning: variable 'iobuf_len' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized]
Quoted 7 lines
Clang won't realize that compat is 0 when
CONFIG_COMPATis not set until the constant folding stage, which happens after this semantic analysis. UseIS_ENABLEDinstead so that the zero is present at the semantic analysis stage, which eliminates this warning.
Applied, thanks.
PATCH 1/1 net: atm: Add another IS_ENABLED(CONFIG_COMPAT) in atm_dev_ioctl
In reply to Nathan ChancellorI removed compat's universal assignment to 0, which allows this if statement to fall through when compat is passed with a value other than 0.
---
Sorry for not paying more attention :(
net/atm/resources.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/atm/resources.c +1 -1
@@ -413,7 +413,7 @@ int atm_dev_ioctl(unsigned int cmd, void __user *arg, int compat) }/* fall through */ default : -if (compat) { +if (IS_ENABLED (CONFIG_COMPAT ) && compat) {#ifdef CONFIG_COMPAT if (!dev->ops->compat_ioctl) { error = -EINVAL ;
Signature · 1 line
2.21.0
Re: [PATCH] net: atm: Add another IS_ENABLED(CONFIG_COMPAT) in atm_dev_ioctl
From: Nathan Chancellor <[email protected]>
Date: Thu, 7 Mar 2019 11:11:26 -0700
Quoted 6 lines
I removed compat's universal assignment to 0, which allows this if statement to fall through when compat is passed with a value other than 0.
Fixes f9d19a7494e5 ("net: atm: Use IS_ENABLED in atm_dev_ioctl")Signed-off-by Nathan Chancellor <[email protected]>
Applied.