2023-02-13 10:12:50

by Arnd Bergmann

Subject: [PATCH] cxl: avoid returning uninitialized error code

From: Arnd Bergmann <[email protected]>

The new cxl_add_to_region() function returns an uninitialized
value on success:

drivers/cxl/core/region.c:2628:6: error: variable 'rc' is used uninitialized whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized]
if (IS_ERR(cxlr)) {
^~~~~~~~~~~~
drivers/cxl/core/region.c:2654:9: note: uninitialized use occurs here
return rc;

Simplify the logic to have the rc variable always initialized in the
same place.

Fixes: a32320b71f08 ("cxl/region: Add region autodiscovery")
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/cxl/core/region.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/cxl/core/region.c b/drivers/cxl/core/region.c
index fe1d8392870e..f29028148806 100644
--- a/drivers/cxl/core/region.c
+++ b/drivers/cxl/core/region.c
@@ -2625,10 +2625,9 @@ int cxl_add_to_region(struct cxl_port *root, struct cxl_endpoint_decoder *cxled)
cxlr = to_cxl_region(region_dev);
mutex_unlock(&cxlrd->range_lock);

- if (IS_ERR(cxlr)) {
- rc = PTR_ERR(cxlr);
+ rc = PTR_ERR_OR_ZERO(cxlr);
+ if (rc)
goto out;
- }

attach_target(cxlr, cxled, -1, TASK_UNINTERRUPTIBLE);

--
2.39.1

2023-02-14 16:36:25

by Dan Williams

Subject: RE: [PATCH] cxl: avoid returning uninitialized error code

Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> The new cxl_add_to_region() function returns an uninitialized
> value on success:
>
> drivers/cxl/core/region.c:2628:6: error: variable 'rc' is used uninitialized whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized]
> if (IS_ERR(cxlr)) {
> ^~~~~~~~~~~~
> drivers/cxl/core/region.c:2654:9: note: uninitialized use occurs here
> return rc;
>
> Simplify the logic to have the rc variable always initialized in the
> same place.
>
> Fixes: a32320b71f08 ("cxl/region: Add region autodiscovery")
> Signed-off-by: Arnd Bergmann <[email protected]>

Looks good, thanks Arnd.