From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 53A83C2B9F4 for ; Tue, 22 Jun 2021 10:48:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2F2C660FF1 for ; Tue, 22 Jun 2021 10:48:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230031AbhFVKuZ (ORCPT ); Tue, 22 Jun 2021 06:50:25 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:48530 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229873AbhFVKuX (ORCPT ); Tue, 22 Jun 2021 06:50:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624358887; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0buC7lbynvX5/in4z4I52ozFnZpiaDrJ78DyP4/2luc=; b=Xqhv6JUOxln5N6IWyeZ8AKXXVwTtSraF3MF5hQtMsVhzUpiMG0MgjjwcsQZnUGYk4ZLiNd Gnvvnd9jV8joOsXoNoTjqKfXtFCuXOI3LqUm8yZtaIPYBQHLcF8qyeEphlgaOYVkMV1IXj nbujLJHxjHnw096BI9Ml+ajLW2g8F4c= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-363-QOQ8gBh2My-d53vOEqHE4g-1; Tue, 22 Jun 2021 06:48:06 -0400 X-MC-Unique: QOQ8gBh2My-d53vOEqHE4g-1 Received: by mail-ej1-f71.google.com with SMTP id w13-20020a170906384db02903d9ad6b26d8so2720415ejc.0 for ; Tue, 22 Jun 2021 03:48:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=0buC7lbynvX5/in4z4I52ozFnZpiaDrJ78DyP4/2luc=; b=BiDsfa2H3NGuzhI03/pusRJRI2qVGr/r6+4OaUD6lgqUyOcSgzZNkV3Re41FVcKLad CZpshZ3t7vbEz+mYrGrxGpLd44HdD7b7xmKycW92buw9FyQM84w5oYQNUapoZwg3xs/W I+wzHVthYj9cxJHr3hUxiZF5Pwtq3rzyDodAKAk/rlXFXeyQjslZVZens+34COicevBc aAbfhxMFBBmAXPs6B0y3JOfKd9G1FdCEPidweptx71+cUoO7N/4IxgJIscgcaE+KVWcv 9oYMH9UEuA4Sm1fkMvqiDcfiqDqZdu7oj1nSwXduMglrF6bUU7w2UP92uF+sRGORzum5 4C5w== X-Gm-Message-State: AOAM533olNWiAo6bhc0GkHi9+Lsm6urE0+ftZI7e7TWUittjFADX5qsI j89xes80SfbcDahsAmN1rJYmCeP8xYnXm2yHQbZ+yjlX4ehd8lRl5iDbJRakLDMuJpAMwGFLOXj M0T33syoNdQb1M4fMbBoXtjzPimssnvYQRWHo+xwgx9QjbE0NJ2lTvXhXmOcs0bcBqJe+l6limE 8p79Dk X-Received: by 2002:a17:907:9710:: with SMTP id jg16mr3289927ejc.366.1624358885048; Tue, 22 Jun 2021 03:48:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz5aileWLe99V+/CdAHlgVBA0BpV3jxEyL4HHasBcfoPeDcjOMaX+P4AwPUtgs/eaMc3SkZmg== X-Received: by 2002:a17:907:9710:: with SMTP id jg16mr3289894ejc.366.1624358884849; Tue, 22 Jun 2021 03:48:04 -0700 (PDT) Received: from x1.localdomain (2001-1c00-0c1e-bf00-1054-9d19-e0f0-8214.cable.dynamic.v6.ziggo.nl. [2001:1c00:c1e:bf00:1054:9d19:e0f0:8214]) by smtp.gmail.com with ESMTPSA id i17sm1735415ejo.63.2021.06.22.03.48.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 22 Jun 2021 03:48:04 -0700 (PDT) Subject: Re: [PATCH v3] brcmfmac: fix "board_type" in brcmf_of_probe() To: Dan Carpenter , Arend van Spriel , Matthias Brugger , Christophe JAILLET Cc: Franky Lin , Hante Meuleman , Chi-hsien Lin , Wright Feng , Chung-hsien Hsu , Kalle Valo , linux-wireless@vger.kernel.org, brcm80211-dev-list.pdl@broadcom.com, SHA-cyfmac-dev-list@infineon.com, kernel-janitors@vger.kernel.org References: From: Hans de Goede Message-ID: Date: Tue, 22 Jun 2021 12:48:03 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: kernel-janitors@vger.kernel.org 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 > Suggested-by: Christophe JAILLET > Reported-by: Hans deGoede > Signed-off-by: Dan Carpenter Thanks, patch looks good to me: Reviewed-by: Hans de Goede 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); >