diff for duplicates of <YNCHELb14+eNV94n@mwanda> diff --git a/a/1.txt b/N1/1.txt index d175684..4088ff5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -12,18 +12,20 @@ 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, 4 insertions(+), 8 deletions(-) + .../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..8ca62cd0e8ac 100644 +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,16 @@ void brcmf_of_probe(struct device *dev, enum brcmf_bus_type bus_type, +@@ -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) { @@ -40,10 +42,11 @@ index a7554265f95f..8ca62cd0e8ac 100644 - 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) ++ if (!board_type) { ++ of_node_put(root); + return; + } + strreplace(board_type, '/', '-'); settings->board_type = board_type; diff --git a/a/content_digest b/N1/content_digest index cec4f65..c7aa349 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" - "Subject\0[PATCH v2] brcmfmac: fix \"board_type\" in brcmf_of_probe()\0" - "Date\0Mon, 21 Jun 2021 15:33:20 +0300\0" + "Subject\0[PATCH v3] brcmfmac: fix \"board_type\" in brcmf_of_probe()\0" + "Date\0Tue, 22 Jun 2021 13:46:55 +0300\0" "To\0Arend van Spriel <aspriel@gmail.com>" Matthias Brugger <mbrugger@suse.com> " Christophe JAILLET <christophe.jaillet@wanadoo.fr>\0" @@ -31,18 +31,20 @@ "Fixes: 29e354ebeeec (\"brcmfmac: Transform compatible string for FW loading\")\n" "Suggested-by: Johannes Berg <johannes@sipsolutions.net>\n" "Suggested-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>\n" + "Reported-by: Hans deGoede <hdegoede@redhat.com>\n" "Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>\n" "---\n" "v2: Basically a completely different patch. :)\n" + "v3: Add missing of_node_put() caught by Hans de Goede\n" "\n" - " .../net/wireless/broadcom/brcm80211/brcmfmac/of.c | 12 ++++--------\n" - " 1 file changed, 4 insertions(+), 8 deletions(-)\n" + " .../net/wireless/broadcom/brcm80211/brcmfmac/of.c | 12 +++++-------\n" + " 1 file changed, 5 insertions(+), 7 deletions(-)\n" "\n" "diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c\n" - "index a7554265f95f..8ca62cd0e8ac 100644\n" + "index a7554265f95f..dee3d968e49b 100644\n" "--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c\n" "+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c\n" - "@@ -24,20 +24,16 @@ void brcmf_of_probe(struct device *dev, enum brcmf_bus_type bus_type,\n" + "@@ -24,20 +24,18 @@ void brcmf_of_probe(struct device *dev, enum brcmf_bus_type bus_type,\n" " \t/* Set board-type to the first string of the machine compatible prop */\n" " \troot = of_find_node_by_path(\"/\");\n" " \tif (root) {\n" @@ -59,10 +61,11 @@ "-\t\tfor (i = 0; i < board_type[i]; i++) {\n" "-\t\t\tif (board_type[i] == '/')\n" "-\t\t\t\tboard_type[i] = '-';\n" - "-\t\t}\n" "+\t\tboard_type = devm_kstrdup(dev, tmp, GFP_KERNEL);\n" - "+\t\tif (!board_type)\n" + "+\t\tif (!board_type) {\n" + "+\t\t\tof_node_put(root);\n" "+\t\t\treturn;\n" + " \t\t}\n" "+\t\tstrreplace(board_type, '/', '-');\n" " \t\tsettings->board_type = board_type;\n" " \n" @@ -70,4 +73,4 @@ "-- \n" 2.30.2 -054132de0ba2bb86f0ac6bee78ccbd7b5041acd97a4d7d4b51a931dd2657eb5a +9b86fda8293976f17f8f8a35598be9ce10979a07e8beb7c26f1aa14cd67ec4d9
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox