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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 272CAC432C0 for ; Tue, 19 Nov 2019 05:29:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E445B21783 for ; Tue, 19 Nov 2019 05:29:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141385; bh=dpSjd1hk84fWWcoabhUygmApwukG2qV9KDnFTNF0n4o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=OXPQ3EJ1mbRjSqYb6GYp5HP70K8IwKLKqBAO+09KavUZGJ7/Z3y6A8PmT3wxMc4NO yNvgd/IqCfswoQ4IylYa337H3UyFcfvpmJ+XgUutC/2ot13TY9HgGOItdQzkMBtV3E C70zm3szsSiFB/Z40i4hyyNulPuVUZZ2vhicY/Xw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727637AbfKSF3n (ORCPT ); Tue, 19 Nov 2019 00:29:43 -0500 Received: from mail.kernel.org ([198.145.29.99]:48234 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729016AbfKSF3i (ORCPT ); Tue, 19 Nov 2019 00:29:38 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2BE5F21783; Tue, 19 Nov 2019 05:29:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141377; bh=dpSjd1hk84fWWcoabhUygmApwukG2qV9KDnFTNF0n4o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=v1mazikRd+sqggaSNrgEar2vY0vt2xDMcVgYLOERtfgyH0XmfY9r2SexyUJ0rmfQj uy5T2ooALx2ALJ5zRUlWzcOunaBo50a4eCXSEnGG6Mn926B+kRzh0gm3A0P+RdOHRQ INZqZMzF6dEjAxNksegf8Z2T6gcAtJgeeT09w/6g= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Rasmus Villemoes , Kalle Valo , Sasha Levin Subject: [PATCH 4.19 099/422] brcmfmac: fix wrong strnchr usage Date: Tue, 19 Nov 2019 06:14:56 +0100 Message-Id: <20191119051405.677762994@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rasmus Villemoes [ Upstream commit cb18e2e9ec71d42409a51b83546686c609780dde ] strnchr takes arguments in the order of its name: string, max bytes to read, character to search for. Here we're passing '\n' aka 10 as the buffer size, and searching for sizeof(buf) aka BRCMF_DCMD_SMLEN aka 256 (aka '\0', since it's implicitly converted to char) within those 10 bytes. Just interchanging the last two arguments would still leave a bug, because if we've been successful once, there are not sizeof(buf) characters left after the new value of p. Since clmver is immediately afterwards passed as a %s argument, I assume that it is actually a properly nul-terminated string. For that case, we have strreplace(). Signed-off-by: Rasmus Villemoes Signed-off-by: Kalle Valo Signed-off-by: Sasha Levin --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c index 27893af63ebc3..8510d207ee87d 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c @@ -296,9 +296,7 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp) /* Replace all newline/linefeed characters with space * character */ - ptr = clmver; - while ((ptr = strnchr(ptr, '\n', sizeof(buf))) != NULL) - *ptr = ' '; + strreplace(clmver, '\n', ' '); brcmf_dbg(INFO, "CLM version = %s\n", clmver); } -- 2.20.1