Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Wed, 8 Sep 2021 16:12:54 +0300
From:   Dan Carpenter <dan.carpenter@oracle.com>
To:     Arend van Spriel <aspriel@gmail.com>,
        Matthias Brugger <mbrugger@suse.com>,
        Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc:     Franky Lin <franky.lin@broadcom.com>,
        Hante Meuleman <hante.meuleman@broadcom.com>,
        Chi-hsien Lin <chi-hsien.lin@infineon.com>,
        Wright Feng <wright.feng@infineon.com>,
        Chung-hsien Hsu <chung-hsien.hsu@infineon.com>,
        Kalle Valo <kvalo@codeaurora.org>,
        Hans deGoede <hdegoede@redhat.com>,
        linux-wireless@vger.kernel.org,
        brcm80211-dev-list.pdl@broadcom.com,
        SHA-cyfmac-dev-list@infineon.com, kernel-janitors@vger.kernel.org
Subject: Re: [PATCH v3] brcmfmac: fix "board_type" in brcmf_of_probe()
Message-ID: <20210908131254.GJ1935@kadam>
References: <YNCHELb14+eNV94n@mwanda>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <YNCHELb14+eNV94n@mwanda>
User-Agent: Mutt/1.9.4 (2018-02-28)
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?fCtO43JJS8SPbrorD053eZ+tbGMwpJW+eB6Tsi4R4kOJaEiS9EZA/qsCkEPm?=
 =?us-ascii?Q?L6eM/mIbXgCeXtrZ0aAWL1bauKa/wKTtZoJrl4cns82/GVcLR5fSoVeu4qot?=
 =?us-ascii?Q?PtltxvruOmoWBscR6NcJbM1g2B0+h1Grg+e7MNLy1JNYb8oW1o1XD8kQpXOn?=
 =?us-ascii?Q?QpvmBnc3gOI1j1JJGifODbd1MQYr8G+0nLfcss9UlMGWjyXRkdAJzQ/Szwly?=
 =?us-ascii?Q?vEslgL9x3oZOeoTusJTuc2gAN9GWQkM1F9dvSTbf3ChmDHtSOAeXDpcezRvI?=
 =?us-ascii?Q?9/QwUmmX57ZqWFkMaLUVUEsOzCSXrC2EkLGw1IbetgVQgzrkFnQ5jQFIkWf2?=
 =?us-ascii?Q?G9Wnr1b2LmcFLaSNgHOgF8+TRB7rtOLm9Jm46xa2VYcW5D751NYdl7964gO6?=
 =?us-ascii?Q?iVCJAAhqzkkTrr4mA04pD9kaZu3MYnd4IVcmN4H8/4MnW57XiegLzO3Vu1lV?=
 =?us-ascii?Q?Ky0dfWxsfpWVwGLf9rnRstJoW5YHREOGO9aQd1ftYFgjqAf4/PEkd38EYXai?=
 =?us-ascii?Q?SpCAF5nffq4ZlToVfL8zYqxKiOlkvnLuU/k2JXz+w8lkW4jH5zjQY3w//8bz?=
 =?us-ascii?Q?GyWVe2eW9e2DBJF2Wop7+9N8prufGkNlMj9wv5eKgmhGCrj1ebQMLkMK/UDb?=
 =?us-ascii?Q?hZgVqD+gpjmkDvCSGAR95+bHMMVHpRHB1aKQwEDROlnvNgxQ+MrJqjTQ0YIo?=
 =?us-ascii?Q?j/KtpIYaoyn4b/ZQ0GNHGuryxQb8qrGVeXqic9d8V/QgSJRUBYv1qKJ+8IMF?=
 =?us-ascii?Q?x1T118Z/grLB4qEzsxJE6H8yuAEhBXFDKiyeS/PlB4BpbqWbWJHvafbq5xZa?=
 =?us-ascii?Q?TIAF6lNcRPeFDgt2hRsfIK0njKZdRPRITFTt7Yo8JfvplxqNPBnGJ5QZ07FQ?=
 =?us-ascii?Q?xJ56QhrWG7M5+6UDJWHmJBCJ/RpXtgVkyf0jPKngiQZhdx24dnqiNdXUds1L?=
 =?us-ascii?Q?gCgK+Z+HrMwtiU2vbVvcAAqNt0w53Uf//2HTb1o/Pkb6j6R6vp4oEjCsPO6m?=
 =?us-ascii?Q?JEw4E7BtxoGLIFAD8uZik3jtH76evGyF+QmfZHhuX6F81DUgq5UntOeiDmGK?=
 =?us-ascii?Q?ixcKEvQoPnEgc4MQ2CqG/tlaOdNgTX3Ew6n19f7H0n69phTHIMiaYREQbxF6?=
 =?us-ascii?Q?pYaZP9H4HJ6m7chtxEWVvZoYytEQdPVeQEhHwdoq6SdO65PFtBXNjCMFWIEW?=
 =?us-ascii?Q?QCgmGQtAB/1z/9nwZm3htqWyeoAdlaVQR7R8gvmLFi3rLp0DNo2/yDqRSWna?=
 =?us-ascii?Q?h0DrDh68jiFNBk+tjIAYPNjCQkBnuZcNUJ/pxEKGRVZwLopST7V8wMCcgSgG?=
 =?us-ascii?Q?iE80AtjtehSNam5bJi30W4yY?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 1e0751c2-2ea4-448f-24e4-08d972ca6a8c
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2365.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Sep 2021 13:13:14.8304
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: x1uxL/xBwdLQXS8EC7C7kMidN7e2CF0iqC9S+PoQ7+0dlSJ2hTzXUqG35SaLg66VPNwoG3BMnUhz8u7HNWhzj2Fi9xE2DyWOje5NuxJVQfU=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR10MB1661
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10100 signatures=668682
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxlogscore=999 bulkscore=0
 suspectscore=0 mlxscore=0 phishscore=0 malwarescore=0 adultscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2109030001
 definitions=main-2109080085
X-Proofpoint-GUID: LaG7XhL3a-3t0KttQ6UBsKg2rs0Jmqaa
X-Proofpoint-ORIG-GUID: LaG7XhL3a-3t0KttQ6UBsKg2rs0Jmqaa
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org

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