2021-06-21 12:34:46

by Dan Carpenter

[permalink] [raw]
Subject: [PATCH v2] brcmfmac: fix "board_type" in brcmf_of_probe()

There are two bugs here:
1) devm_kzalloc() needs to be checked for allocation errors.
2) The loop was intended to be:

Bad: for (i = 0; i < board_type[i]; i++) {
Good: for (i = 0; i < len; i++) {

Neither of these bugs are likely to cause an issue in practice but
they're worth fixing. Also the code could be made simpler by using the
devm_kstrdup() and strreplace() functions.

Fixes: 29e354ebeeec ("brcmfmac: Transform compatible string for FW loading")
Suggested-by: Johannes Berg <[email protected]>
Suggested-by: Christophe JAILLET <[email protected]>
Signed-off-by: Dan Carpenter <[email protected]>
---
v2: Basically a completely different patch. :)

.../net/wireless/broadcom/brcm80211/brcmfmac/of.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
index a7554265f95f..8ca62cd0e8ac 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
@@ -24,20 +24,16 @@ void brcmf_of_probe(struct device *dev, enum brcmf_bus_type bus_type,
/* Set board-type to the first string of the machine compatible prop */
root = of_find_node_by_path("/");
if (root) {
- int i, len;
char *board_type;
const char *tmp;

of_property_read_string_index(root, "compatible", 0, &tmp);

/* get rid of '/' in the compatible string to be able to find the FW */
- len = strlen(tmp) + 1;
- board_type = devm_kzalloc(dev, len, GFP_KERNEL);
- strscpy(board_type, tmp, len);
- for (i = 0; i < board_type[i]; i++) {
- if (board_type[i] == '/')
- board_type[i] = '-';
- }
+ board_type = devm_kstrdup(dev, tmp, GFP_KERNEL);
+ if (!board_type)
+ return;
+ strreplace(board_type, '/', '-');
settings->board_type = board_type;

of_node_put(root);
--
2.30.2


2021-06-21 12:41:28

by Hans de Goede

[permalink] [raw]
Subject: Re: [PATCH v2] brcmfmac: fix "board_type" in brcmf_of_probe()

Hi,

On 6/21/21 2:33 PM, Dan Carpenter wrote:
> There are two bugs here:
> 1) devm_kzalloc() needs to be checked for allocation errors.
> 2) The loop was intended to be:
>
> Bad: for (i = 0; i < board_type[i]; i++) {
> Good: for (i = 0; i < len; i++) {
>
> Neither of these bugs are likely to cause an issue in practice but
> they're worth fixing. Also the code could be made simpler by using the
> devm_kstrdup() and strreplace() functions.
>
> Fixes: 29e354ebeeec ("brcmfmac: Transform compatible string for FW loading")
> Suggested-by: Johannes Berg <[email protected]>
> Suggested-by: Christophe JAILLET <[email protected]>
> Signed-off-by: Dan Carpenter <[email protected]>
> ---
> v2: Basically a completely different patch. :)
>
> .../net/wireless/broadcom/brcm80211/brcmfmac/of.c | 12 ++++--------
> 1 file changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
> index a7554265f95f..8ca62cd0e8ac 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
> @@ -24,20 +24,16 @@ void brcmf_of_probe(struct device *dev, enum brcmf_bus_type bus_type,
> /* Set board-type to the first string of the machine compatible prop */
> root = of_find_node_by_path("/");
> if (root) {
> - int i, len;
> char *board_type;
> const char *tmp;
>
> of_property_read_string_index(root, "compatible", 0, &tmp);
>
> /* get rid of '/' in the compatible string to be able to find the FW */
> - len = strlen(tmp) + 1;
> - board_type = devm_kzalloc(dev, len, GFP_KERNEL);
> - strscpy(board_type, tmp, len);
> - for (i = 0; i < board_type[i]; i++) {
> - if (board_type[i] == '/')
> - board_type[i] = '-';
> - }
> + board_type = devm_kstrdup(dev, tmp, GFP_KERNEL);
> + if (!board_type)
> + return;

The error handling here seems to be lacking, specifically
this error-exit path needs a of_node_put(root); call (or
a "goto put;" or some such)

Regards,

Hans



> + strreplace(board_type, '/', '-');
> settings->board_type = board_type;
>
> of_node_put(root);
>

2021-06-21 12:48:19

by Dan Carpenter

[permalink] [raw]
Subject: Re: [PATCH v2] brcmfmac: fix "board_type" in brcmf_of_probe()

On Mon, Jun 21, 2021 at 02:41:03PM +0200, Hans de Goede wrote:
> Hi,
>
> On 6/21/21 2:33 PM, Dan Carpenter wrote:
> > There are two bugs here:
> > 1) devm_kzalloc() needs to be checked for allocation errors.
> > 2) The loop was intended to be:
> >
> > Bad: for (i = 0; i < board_type[i]; i++) {
> > Good: for (i = 0; i < len; i++) {
> >
> > Neither of these bugs are likely to cause an issue in practice but
> > they're worth fixing. Also the code could be made simpler by using the
> > devm_kstrdup() and strreplace() functions.
> >
> > Fixes: 29e354ebeeec ("brcmfmac: Transform compatible string for FW loading")
> > Suggested-by: Johannes Berg <[email protected]>
> > Suggested-by: Christophe JAILLET <[email protected]>
> > Signed-off-by: Dan Carpenter <[email protected]>
> > ---
> > v2: Basically a completely different patch. :)
> >
> > .../net/wireless/broadcom/brcm80211/brcmfmac/of.c | 12 ++++--------
> > 1 file changed, 4 insertions(+), 8 deletions(-)
> >
> > diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
> > index a7554265f95f..8ca62cd0e8ac 100644
> > --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
> > +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
> > @@ -24,20 +24,16 @@ void brcmf_of_probe(struct device *dev, enum brcmf_bus_type bus_type,
> > /* Set board-type to the first string of the machine compatible prop */
> > root = of_find_node_by_path("/");
> > if (root) {
> > - int i, len;
> > char *board_type;
> > const char *tmp;
> >
> > of_property_read_string_index(root, "compatible", 0, &tmp);
> >
> > /* get rid of '/' in the compatible string to be able to find the FW */
> > - len = strlen(tmp) + 1;
> > - board_type = devm_kzalloc(dev, len, GFP_KERNEL);
> > - strscpy(board_type, tmp, len);
> > - for (i = 0; i < board_type[i]; i++) {
> > - if (board_type[i] == '/')
> > - board_type[i] = '-';
> > - }
> > + board_type = devm_kstrdup(dev, tmp, GFP_KERNEL);
> > + if (!board_type)
> > + return;
>
> The error handling here seems to be lacking, specifically
> this error-exit path needs a of_node_put(root); call (or
> a "goto put;" or some such)

Good catch. I will add a call to of_node_put().

regards,
dan carpenter

2021-06-22 10:49:13

by Hans de Goede

[permalink] [raw]
Subject: Re: [PATCH v3] brcmfmac: fix "board_type" in brcmf_of_probe()

Hi,

On 6/22/21 12:46 PM, Dan Carpenter wrote:
> There are two bugs here:
> 1) devm_kzalloc() needs to be checked for allocation errors.
> 2) The loop was intended to be:
>
> Bad: for (i = 0; i < board_type[i]; i++) {
> Good: for (i = 0; i < len; i++) {
>
> Neither of these bugs are likely to cause an issue in practice but
> they're worth fixing. Also the code could be made simpler by using the
> devm_kstrdup() and strreplace() functions.
>
> Fixes: 29e354ebeeec ("brcmfmac: Transform compatible string for FW loading")
> Suggested-by: Johannes Berg <[email protected]>
> Suggested-by: Christophe JAILLET <[email protected]>
> Reported-by: Hans deGoede <[email protected]>
> Signed-off-by: Dan Carpenter <[email protected]>

Thanks, patch looks good to me:

Reviewed-by: Hans de Goede <[email protected]>

Regards,

Hans



> ---
> v2: Basically a completely different patch. :)
> v3: Add missing of_node_put() caught by Hans de Goede
>
> .../net/wireless/broadcom/brcm80211/brcmfmac/of.c | 12 +++++-------
> 1 file changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
> index a7554265f95f..dee3d968e49b 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
> @@ -24,20 +24,18 @@ void brcmf_of_probe(struct device *dev, enum brcmf_bus_type bus_type,
> /* Set board-type to the first string of the machine compatible prop */
> root = of_find_node_by_path("/");
> if (root) {
> - int i, len;
> char *board_type;
> const char *tmp;
>
> of_property_read_string_index(root, "compatible", 0, &tmp);
>
> /* get rid of '/' in the compatible string to be able to find the FW */
> - len = strlen(tmp) + 1;
> - board_type = devm_kzalloc(dev, len, GFP_KERNEL);
> - strscpy(board_type, tmp, len);
> - for (i = 0; i < board_type[i]; i++) {
> - if (board_type[i] == '/')
> - board_type[i] = '-';
> + board_type = devm_kstrdup(dev, tmp, GFP_KERNEL);
> + if (!board_type) {
> + of_node_put(root);
> + return;
> }
> + strreplace(board_type, '/', '-');
> settings->board_type = board_type;
>
> of_node_put(root);
>

2021-06-22 10:57:10

by Matthias Brugger

[permalink] [raw]
Subject: Re: [PATCH v3] brcmfmac: fix "board_type" in brcmf_of_probe()



On 22/06/2021 12:46, Dan Carpenter wrote:
> There are two bugs here:
> 1) devm_kzalloc() needs to be checked for allocation errors.
> 2) The loop was intended to be:
>
> Bad: for (i = 0; i < board_type[i]; i++) {
> Good: for (i = 0; i < len; i++) {
>
> Neither of these bugs are likely to cause an issue in practice but
> they're worth fixing. Also the code could be made simpler by using the
> devm_kstrdup() and strreplace() functions.
>
> Fixes: 29e354ebeeec ("brcmfmac: Transform compatible string for FW loading")
> Suggested-by: Johannes Berg <[email protected]>
> Suggested-by: Christophe JAILLET <[email protected]>
> Reported-by: Hans deGoede <[email protected]>
> Signed-off-by: Dan Carpenter <[email protected]>

Thanks for taking care of this.

Reviewed-by: Matthias Brugger <[email protected]>

> ---
> v2: Basically a completely different patch. :)
> v3: Add missing of_node_put() caught by Hans de Goede
>
> .../net/wireless/broadcom/brcm80211/brcmfmac/of.c | 12 +++++-------
> 1 file changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
> index a7554265f95f..dee3d968e49b 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
> @@ -24,20 +24,18 @@ void brcmf_of_probe(struct device *dev, enum brcmf_bus_type bus_type,
> /* Set board-type to the first string of the machine compatible prop */
> root = of_find_node_by_path("/");
> if (root) {
> - int i, len;
> char *board_type;
> const char *tmp;
>
> of_property_read_string_index(root, "compatible", 0, &tmp);
>
> /* get rid of '/' in the compatible string to be able to find the FW */
> - len = strlen(tmp) + 1;
> - board_type = devm_kzalloc(dev, len, GFP_KERNEL);
> - strscpy(board_type, tmp, len);
> - for (i = 0; i < board_type[i]; i++) {
> - if (board_type[i] == '/')
> - board_type[i] = '-';
> + board_type = devm_kstrdup(dev, tmp, GFP_KERNEL);
> + if (!board_type) {
> + of_node_put(root);
> + return;
> }
> + strreplace(board_type, '/', '-');
> settings->board_type = board_type;
>
> of_node_put(root);
>