Received: by 2002:a05:7412:251c:b0:e2:908c:2ebd with SMTP id w28csp1381823rda; Mon, 23 Oct 2023 10:46:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHzE81v2a3QMDV20qjnowOKzG5FwJcYAW7b8Fjmh2gRGBnruo41/7PgOQkcVmFgHkIry+xk X-Received: by 2002:a05:6a00:21cf:b0:6bd:705b:56fb with SMTP id t15-20020a056a0021cf00b006bd705b56fbmr7989621pfj.6.1698083171958; Mon, 23 Oct 2023 10:46:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698083171; cv=none; d=google.com; s=arc-20160816; b=rzwzzw4xu0yI+awbxljiUqN4Tyg+ErT+/+iDL0UTNQ8arLKM9Zexc985k5+ZSgwhLG 9LySUvNwrXP/FLAANFTQaAAx3HyRy6EDZCg415YLx7DPvu63SVVd1g/KARqI98Fo2RV6 9mpksrQ71gW6kEXfJ/VS0lV35tWoIjEJjuN8R+EetAZh8oRVL2DYQQ0axyjGb14koh9T Xd3b4dRYmXTkZ/YmRgiRaOsZ4T/NKoWnAI8RohHbWIsgYrOmeRaj6TA719rWRsHh835U UJNIqYzXUgbKOw80d19THit3TiTMHArWNFBHgHHusqO2aSvcTXQhnk8ThZUCUGn+dGRw 3TmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:message-id:user-agent:cc:to:references :in-reply-to:from:subject:content-transfer-encoding:mime-version :dkim-signature; bh=Nq3cOBEUX6fIHc4eTuY9Wmn64InqdPLg3dvkzQLa8Lk=; fh=/5Ctfx2ilDt7yiT0kTR9x2aGarm1cw3mbdZUCnlD9Bk=; b=Ddy8cS2nDnyWOwK/DgpoP6vstdctSNtG/5oy8tIratdR4z8yho3F3eZ4iv8uv+m6JO oNBusGpR8Ip6Vu2C/WbmNIhACZxP0fcyfuywLp5kBYDBvgNRRFc3QD2IaY5wsujANPjX 7RFUdf50yFZsBgWDv144ZBzOfeunZWdSGG4gnx/NNC2nYLEYK0EecPTTUxEU4t5z12Ju 4Y8RgInFDGNScfwSdt8zir2lVgw9gjzclUaodnAZzzOE0GcBRvCSECqHZXRTaIHfXp7u ApTKLUwv7aFpLUEYmXirb89sT8l2oteKjuf6TTtFy7c6w1TXqMRFoRpmJz8hu12wX+ZG 2fWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="sgP7r5/n"; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id w63-20020a638242000000b00578b9fb24f3si6597152pgd.633.2023.10.23.10.46.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 10:46:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="sgP7r5/n"; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 230AB804E6AA; Mon, 23 Oct 2023 10:46:11 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231640AbjJWRqI (ORCPT + 52 others); Mon, 23 Oct 2023 13:46:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36928 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233686AbjJWRbK (ORCPT ); Mon, 23 Oct 2023 13:31:10 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 30D48268A; Mon, 23 Oct 2023 10:30:09 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1E09CC433C8; Mon, 23 Oct 2023 17:30:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1698082208; bh=deh2wsvZ61fWtmEQc1gLXLTEpTjWtn+nTqnym4bzUIU=; h=Subject:From:In-Reply-To:References:To:Cc:Date:From; b=sgP7r5/n6+Unly72cTqpsqVIhg/a8KatNXbswT9Oy1lXIh5aIgLrwLp4mHBWSbBk/ ssyjQQKIi01YY2uxf4hIk/vy127Fs+TgKwcD3t26qNQy35hSyA0umSUWJ5GKzFSHbv oPO1Ce5t2yVWTPOFiunIPyzaehEwrJAnmCBpH3sHvoRXwUI4/hDX79i7FHh1BU564A v7ZlmCW+oO03F1cOYM1DbIqBY7pj+Uj8AInOXZFsNYMpTtjGDjzMCn/sXR9F59ET4G /7I/2PmB6Zn0EGu9omG7yShQiQWCkG+oXBTj+ZpTH880Xnz8tOqg3LV/vs67Hp0Z0l /eh5a2XgQ/t0g== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: Re: [PATCH] wifi: wlcore: main: replace deprecated strncpy with strscpy From: Kalle Valo In-Reply-To: <20231018-strncpy-drivers-net-wireless-ti-wlcore-main-c-v1-1-1b1055f482a1@google.com> References: <20231018-strncpy-drivers-net-wireless-ti-wlcore-main-c-v1-1-1b1055f482a1@google.com> To: Justin Stitt Cc: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, Justin Stitt User-Agent: pwcli/0.1.1-git (https://github.com/kvalo/pwcli/) Python/3.11.2 Message-ID: <169808220419.695306.17268024250828658883.kvalo@kernel.org> Date: Mon, 23 Oct 2023 17:30:06 +0000 (UTC) X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 23 Oct 2023 10:46:11 -0700 (PDT) Justin Stitt wrote: > strncpy() is deprecated for use on NUL-terminated destination strings > [1] and as such we should prefer more robust and less ambiguous string > interfaces. > > We expect fw_version strings to be NUL-terminated based on other similar > assignments: > > wireless/broadcom/brcm80211/brcmsmac/main.c > 7867: snprintf(wlc->wiphy->fw_version, > 7868: sizeof(wlc->wiphy->fw_version), "%u.%u", rev, patch); > > wireless/broadcom/b43legacy/main.c > 1765: snprintf(wiphy->fw_version, sizeof(wiphy->fw_version), "%u.%u", > > wireless/broadcom/b43/main.c > 2730: snprintf(wiphy->fw_version, sizeof(wiphy->fw_version), "%u.%u", > > wireless/intel/iwlwifi/dvm/main.c > 1465: snprintf(priv->hw->wiphy->fw_version, > 1466: sizeof(priv->hw->wiphy->fw_version), > > wireless/intel/ipw2x00/ipw2100.c > 5905: snprintf(info->fw_version, sizeof(info->fw_version), "%s:%d:%s", > > Based on this, NUL-padding is not required. > > A suitable replacement is `strscpy` [2] due to the fact that it > guarantees NUL-termination on the destination buffer without > unnecessarily NUL-padding. > > Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings [1] > Link: https://manpages.debian.org/testing/linux-manual-4.8/strscpy.9.en.html [2] > Link: https://github.com/KSPP/linux/issues/90 > Cc: linux-hardening@vger.kernel.org > Signed-off-by: Justin Stitt > Reviewed-by: Kees Cook Patch applied to wireless-next.git, thanks. 3f791c60cccd wifi: wlcore: main: replace deprecated strncpy with strscpy -- https://patchwork.kernel.org/project/linux-wireless/patch/20231018-strncpy-drivers-net-wireless-ti-wlcore-main-c-v1-1-1b1055f482a1@google.com/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches