From patchwork Fri May 22 21:45:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 6469041 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C4E9CC0020 for ; Fri, 22 May 2015 21:45:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BE1852052D for ; Fri, 22 May 2015 21:45:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D4FA12052C for ; Fri, 22 May 2015 21:45:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161065AbbEVVpl (ORCPT ); Fri, 22 May 2015 17:45:41 -0400 Received: from mail-wg0-f43.google.com ([74.125.82.43]:36298 "EHLO mail-wg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2992477AbbEVVpk (ORCPT ); Fri, 22 May 2015 17:45:40 -0400 Received: by wgbgq6 with SMTP id gq6so28857007wgb.3 for ; Fri, 22 May 2015 14:45:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=AbEDUljPYnZYopADyEQ90JAPMz0W9iei7UKI9dAhHYU=; b=ndQmVZ15AbPdKC4DLo4FMSSfjPhv6uv1baHPA34ZfXWgwjHS3nMmn97SVir4Gs09De K0EUpbDzHaq06m1sISoOTvkRz6YLOH0PAGujHLo3s/0RDmKOxT+XxCsZyi/YRMU2hbjn TmmrhzfXkPmycFMPB4exUw/oUDXR1iDNgFFAPhhexQo7Su4d6/GXZGltNspEh35GqqZ4 6xbQkWJ7sYLzVGKffn9gCMbb429nvYkm5T8FVdbOC7b2UPhh6YTL8TY0OrFSgJssdGJK KrI/CgGhyJfCv5tv/R6R+QuOtCi8SeqtJL4VORtfxuFtLc7f+V8HOKHP4GmB7F/h458R R3ig== X-Received: by 10.194.87.1 with SMTP id t1mr19127088wjz.24.1432331138723; Fri, 22 May 2015 14:45:38 -0700 (PDT) Received: from linux-tdhb.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by mx.google.com with ESMTPSA id b10sm124394wic.1.2015.05.22.14.45.37 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 May 2015 14:45:37 -0700 (PDT) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: Kalle Valo , linux-wireless@vger.kernel.org Cc: Brett Rudley , Arend van Spriel , "Franky (Zhenhui) Lin" , Hante Meuleman , brcm80211-dev-list@broadcom.com, =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Subject: [PATCH V3] brcmfmac: allow NVRAM values to contain spaces Date: Fri, 22 May 2015 23:45:28 +0200 Message-Id: <1432331128-24011-1-git-send-email-zajec5@gmail.com> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1432145701-15150-1-git-send-email-zajec5@gmail.com> References: <1432145701-15150-1-git-send-email-zajec5@gmail.com> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Platform NVRAMs often contain values with spaces. Even if right now most firmware-supported entries are simple values, we shouldn't reject these with spaces. It was semi-confirmed by Broadocm in the early patch adding support for platform NVRAMs. Signed-off-by: Rafa? Mi?ecki Acked-by: Arend van Spriel --- V2: Minor change in commit message only. Provide an example of NVRAM entry using space (not just a '#'). It's unprefixed (shouldn't be uploaded to hardware anyway), but proves it's allowed in general. V3: As commented by Arend, accept space only (not a '#'). --- drivers/net/wireless/brcm80211/brcmfmac/firmware.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/brcm80211/brcmfmac/firmware.c b/drivers/net/wireless/brcm80211/brcmfmac/firmware.c index 45d7191..baad939 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/firmware.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/firmware.c @@ -66,6 +66,12 @@ struct nvram_parser { bool multi_dev_v2; }; +/** + * is_nvram_char() - check if char is a valid one for NVRAM entry + * + * It accepts all printable ASCII chars except for '#' which opens a comment. + * Please note that ' ' (space) while accepted is not a valid key name char. + */ static bool is_nvram_char(char c) { /* comment marker excluded */ @@ -73,7 +79,7 @@ static bool is_nvram_char(char c) return false; /* key and value may have any other readable character */ - return (c > 0x20 && c < 0x7f); + return (c >= 0x20 && c < 0x7f); } static bool is_whitespace(char c) @@ -120,7 +126,7 @@ static enum nvram_parser_state brcmf_nvram_handle_key(struct nvram_parser *nvp) nvp->multi_dev_v1 = true; if (strncmp(&nvp->fwnv->data[nvp->entry], "pcie/", 5) == 0) nvp->multi_dev_v2 = true; - } else if (!is_nvram_char(c)) { + } else if (!is_nvram_char(c) || c == ' ') { brcmf_dbg(INFO, "warning: ln=%d:col=%d: '=' expected, skip invalid key entry\n", nvp->line, nvp->column); return COMMENT;