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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 685BEC7EE2E for ; Tue, 13 Jun 2023 00:35:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=wqtWQHCEh/wKSHtyN05dCWWWultRGiCQkmNDWcI1Kmo=; b=BP93FMYTh+4O7b +GCqKYkBN8fbsWvkTEb2XKUXPg8/Y8O40qLZYnXTRy6whewT641JHM2eUv9K4QQ5a0B05Xrf9DFk3 Hix4VQaYf2SWlsx8QQ+bujUITda8WsqEZbOHqfwadooWBHGZrOUxvZ8slzbUON2Di4zMNPak0juIc GAIVVovS+oa89Sl1TtGBZyz4x3iNySJ8aI0xAH7Th2pCfQPxoDpXFUtWXwMVCpo3/pQ/wIidB8yvV t0YcFROBVMzPvw0iiHjbxBhcb5u7wNM2sXlGfD/+udR1F4lclbOrzvDywTQJAGB8YTuyAtrrfkcCw DmHyxsRaULen3mNcq/hQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q8s03-006OlQ-0D; Tue, 13 Jun 2023 00:35:07 +0000 Received: from mail-il1-x132.google.com ([2607:f8b0:4864:20::132]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q8s00-006Ojc-1j; Tue, 13 Jun 2023 00:35:05 +0000 Received: by mail-il1-x132.google.com with SMTP id e9e14a558f8ab-33b3f2f7989so21265035ab.0; Mon, 12 Jun 2023 17:35:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686616501; x=1689208501; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Lcj3LTdqBYzQ+8iEp4pTaRpOWyZfI2CMA9mZFfHhQ/Y=; b=gjlqGloDt9uucOR7CHB7v7jp61ky4iS1uK8CdFNENeoC51SqSVyw1zhMnULxYU2103 y7UuD/U/0KztPu2m7BEkfmDPIIcu75ZjmI/axFDhZs65MKe6QFJPBLKZhBQxcEYVGX1d Qf0WXvjJUwgPXBKufjXk5TnBPQ7MvHOcv4m9SR+Dsy65HRJcxf7xhMwn39XgNblDyZJD irK3qTDg7bLw7S12yY/mkeujlaHyuShkW9BSKqFfXXTPsKFbR9knzEjXksPlrmviQZjw TIAWiHMQnxxB5VXKTIl1OLlWyppDjrEMmrW2mFiCw3TpcUccZmVAZX54pH0hVG0lpV08 3sfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686616501; x=1689208501; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Lcj3LTdqBYzQ+8iEp4pTaRpOWyZfI2CMA9mZFfHhQ/Y=; b=R0QU5CoIlYN9mN1KBhZaOPwn0RPgoIyB0JaJuvb1bxiBvp5GTtpZCFtnopXOHy3rL7 3+ES+i6Y3/rd//GeaUcByyxihuUb47R74myiFCfZU62SgDBDELAib5QPvUxqR9fXSIil 57Xe85GsfQkpqPHg3SbwQJK2gqwCFBIUBmVTmiEWlmgJKngUCv5Yb7hLbS0g9BpaLiQo lKKi4bh94k8P4jFU1HEkX1Q73F9+n6lDFh8dDhJ4cVK0N7YoFicHN5dFnM7g2vi4ZNko rTSSpgjLbvjbc47SQzZGqYi7rZEkbOJN3+YOVb6pHR/dQgtTS3X1jkNsXIyR1ps5VkL/ GPzA== X-Gm-Message-State: AC+VfDxyHlquq6SqWnceDHlY5ZSxP/Qxh+KZeApYzzmHoStPM12Xmk9F WykW4pV518okhXDnMkrjP/0= X-Google-Smtp-Source: ACHHUZ5S0otA0gTmI5YQ9DrVHUh/f+5EYzrFFFgKbXTybv3eHjkkz52csVS8lxXgMUkXm52+uJ3m/Q== X-Received: by 2002:a92:d94c:0:b0:338:af0b:f2bd with SMTP id l12-20020a92d94c000000b00338af0bf2bdmr8813893ilq.5.1686616500842; Mon, 12 Jun 2023 17:35:00 -0700 (PDT) Received: from azeems-kspp.c.googlers.com.com (54.70.188.35.bc.googleusercontent.com. [35.188.70.54]) by smtp.gmail.com with ESMTPSA id t7-20020a92c907000000b0032ab5a86443sm3475382ilp.74.2023.06.12.17.35.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 17:35:00 -0700 (PDT) From: Azeem Shaikh To: Jakub Kicinski Cc: linux-hardening@vger.kernel.org, Azeem Shaikh , linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Kalle Valo , Matthias Brugger , AngeloGioacchino Del Regno , linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: [PATCH] net/mediatek: strlcpy withreturn Date: Tue, 13 Jun 2023 00:34:57 +0000 Message-ID: <20230613003458.3538812-1-azeemshaikh38@gmail.com> X-Mailer: git-send-email 2.41.0.162.gfafddb0af9-goog MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230612_173504_579658_0ED0C8AF X-CRM114-Status: GOOD ( 12.20 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org strlcpy() reads the entire source buffer first. This read may exceed the destination size limit. This is both inefficient and can lead to linear read overflows if a source string is not NUL-terminated [1]. In an effort to remove strlcpy() completely [2], replace strlcpy() here with strscpy(). Direct replacement is safe here since DEV_ASSIGN is only used by TRACE macros and the return values are ignored. [1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strlcpy [2] https://github.com/KSPP/linux/issues/89 Signed-off-by: Azeem Shaikh --- drivers/net/wireless/mediatek/mt7601u/trace.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/mediatek/mt7601u/trace.h b/drivers/net/wireless/mediatek/mt7601u/trace.h index 5a6ba015085f..07696b672161 100644 --- a/drivers/net/wireless/mediatek/mt7601u/trace.h +++ b/drivers/net/wireless/mediatek/mt7601u/trace.h @@ -16,7 +16,7 @@ #define MAXNAME 32 #define DEV_ENTRY __array(char, wiphy_name, 32) -#define DEV_ASSIGN strlcpy(__entry->wiphy_name, \ +#define DEV_ASSIGN strscpy(__entry->wiphy_name, \ wiphy_name(dev->hw->wiphy), MAXNAME) #define DEV_PR_FMT "%s " #define DEV_PR_ARG __entry->wiphy_name -- 2.41.0.162.gfafddb0af9-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel