ethtool: potential NULL dereference in strset_prepare_data()
diff mbox series

Message ID 20200108054236.ult5qxiiwpw2wamk@kili.mountain
State Accepted
Delegated to: David Miller
Headers show
Series
  • ethtool: potential NULL dereference in strset_prepare_data()
Related show

Commit Message

Dan Carpenter Jan. 8, 2020, 5:42 a.m. UTC
Smatch complains that the NULL checking isn't done consistently:

    net/ethtool/strset.c:253 strset_prepare_data()
    error: we previously assumed 'dev' could be null (see line 233)

It looks like there is a missing return on this path.

Fixes: 71921690f974 ("ethtool: provide string sets with STRSET_GET request")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
 net/ethtool/strset.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Michal Kubecek Jan. 8, 2020, 9:17 a.m. UTC | #1
On Wed, Jan 08, 2020 at 08:42:36AM +0300, Dan Carpenter wrote:
> Smatch complains that the NULL checking isn't done consistently:
> 
>     net/ethtool/strset.c:253 strset_prepare_data()
>     error: we previously assumed 'dev' could be null (see line 233)
> 
> It looks like there is a missing return on this path.

I believe this is a false positive as the first loop makes sure no
explicitly requested set is per device if dev is NULL so that we would
never actually call strset_prepare_set() with null dev.

But there is no point to go through the second part of the function if
it is not going to do anything and the fact that it took me few minutes
to make sure the null pointer dereference is not possible clearly
indicates the code is cleaner with the explicit return.

Reviewed-by: Michal Kubecek <mkubecek@suse.cz>

> Fixes: 71921690f974 ("ethtool: provide string sets with STRSET_GET request")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
>  net/ethtool/strset.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/net/ethtool/strset.c b/net/ethtool/strset.c
> index 9f2243329015..82a059c13c1c 100644
> --- a/net/ethtool/strset.c
> +++ b/net/ethtool/strset.c
> @@ -239,6 +239,7 @@ static int strset_prepare_data(const struct ethnl_req_info *req_base,
>  				return -EINVAL;
>  			}
>  		}
> +		return 0;
>  	}
>  
>  	ret = ethnl_ops_begin(dev);
> -- 
> 2.11.0
>
David Miller Jan. 9, 2020, 12:04 a.m. UTC | #2
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Wed, 8 Jan 2020 08:42:36 +0300

> Smatch complains that the NULL checking isn't done consistently:
> 
>     net/ethtool/strset.c:253 strset_prepare_data()
>     error: we previously assumed 'dev' could be null (see line 233)
> 
> It looks like there is a missing return on this path.
> 
> Fixes: 71921690f974 ("ethtool: provide string sets with STRSET_GET request")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Applied.

Patch
diff mbox series

diff --git a/net/ethtool/strset.c b/net/ethtool/strset.c
index 9f2243329015..82a059c13c1c 100644
--- a/net/ethtool/strset.c
+++ b/net/ethtool/strset.c
@@ -239,6 +239,7 @@  static int strset_prepare_data(const struct ethnl_req_info *req_base,
 				return -EINVAL;
 			}
 		}
+		return 0;
 	}
 
 	ret = ethnl_ops_begin(dev);