| Message ID | YNCHELb14+eNV94n@mwanda (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | [v2] brcmfmac: fix "board_type" in brcmf_of_probe() | expand |
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 <johannes@sipsolutions.net> > Suggested-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > --- > 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); >
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 <johannes@sipsolutions.net> > > Suggested-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > > --- > > 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
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 <johannes@sipsolutions.net> > Suggested-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > Reported-by: Hans deGoede <hdegoede@redhat.com> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Thanks, patch looks good to me: Reviewed-by: Hans de Goede <hdegoede@redhat.com> 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); >
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 <johannes@sipsolutions.net> > Suggested-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > Reported-by: Hans deGoede <hdegoede@redhat.com> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Thanks for taking care of this. Reviewed-by: Matthias Brugger <mbrugger@suse.com> > --- > 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); >
This patch is still needed. regards, dan carpenter On Tue, Jun 22, 2021 at 01:46:55PM +0300, 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 <johannes@sipsolutions.net> > Suggested-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > Reported-by: Hans deGoede <hdegoede@redhat.com> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > --- > 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); > -- > 2.30.2
Dan Carpenter <dan.carpenter@oracle.com> writes:
> This patch is still needed.
I don't see v3 in patchwork[1], but I do see v2. I don't know what
happened, but please resend the patch as v4.
[1] https://patchwork.kernel.org/project/linux-wireless/list/?series=&submitter=37111&state=*&q=&archive=&delegate=
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);
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 <johannes@sipsolutions.net> Suggested-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> --- v2: Basically a completely different patch. :) .../net/wireless/broadcom/brcm80211/brcmfmac/of.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)