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=-20.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 8F61BC07E95 for ; Sun, 4 Jul 2021 23:10:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7D4C661993 for ; Sun, 4 Jul 2021 23:10:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231992AbhGDXMm (ORCPT ); Sun, 4 Jul 2021 19:12:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:48918 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231453AbhGDXJo (ORCPT ); Sun, 4 Jul 2021 19:09:44 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 467D46194A; Sun, 4 Jul 2021 23:07:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625440024; bh=Vys9mD3EkaYftCei4LNcZ76AI27GxMfOdMxo5nT9LRM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SV/7DI1R/eDzJ8DcGtWXvjwXJPHbbP8T/4dRV8TmgoWyfXiA/9W+UxqHszT5yV2kk p9vDEj/883OkxRD5lw+04E1PGs+LHJQfDvrx2sZFpPDimN5GmriZhVFqFZ0ufSfXCM 5eKRWlr8ykC6R7ycQk0cptwAfjV9xm16RUcPaZgpq1d1WTBzI9+01DFzbiO0EQuPba d0mgwnHSDnuJkN27+7WQJJGRMS5UFQD6AWIbG71BAJV0cP4TXsyDM2oxOtYFyNS9dl FGunRFmXv7/Y6qMDKATyPNyJqUC/UISWbHRLPqHorW4cnbbrsti2xZppKZ7dQut/rX S1o+K56YOUh2g== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Tian Tao , Will Deacon , Sasha Levin , linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.12 34/80] arm64: perf: Convert snprintf to sysfs_emit Date: Sun, 4 Jul 2021 19:05:30 -0400 Message-Id: <20210704230616.1489200-34-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210704230616.1489200-1-sashal@kernel.org> References: <20210704230616.1489200-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org From: Tian Tao [ Upstream commit a5740e955540181f4ab8f076cc9795c6bbe4d730 ] Use sysfs_emit instead of snprintf to avoid buf overrun,because in sysfs_emit it strictly checks whether buf is null or buf whether pagesize aligned, otherwise it returns an error. Signed-off-by: Tian Tao Link: https://lore.kernel.org/r/1621497585-30887-1-git-send-email-tiantao6@hisilicon.com Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- arch/arm64/kernel/perf_event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c index 4658fcf88c2b..3baca49fcf6b 100644 --- a/arch/arm64/kernel/perf_event.c +++ b/arch/arm64/kernel/perf_event.c @@ -312,7 +312,7 @@ static ssize_t slots_show(struct device *dev, struct device_attribute *attr, struct arm_pmu *cpu_pmu = container_of(pmu, struct arm_pmu, pmu); u32 slots = cpu_pmu->reg_pmmir & ARMV8_PMU_SLOTS_MASK; - return snprintf(page, PAGE_SIZE, "0x%08x\n", slots); + return sysfs_emit(page, "0x%08x\n", slots); } static DEVICE_ATTR_RO(slots); -- 2.30.2 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=-18.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 F4079C07E96 for ; Sun, 4 Jul 2021 23:33:10 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id B68B0613B9 for ; Sun, 4 Jul 2021 23:33:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B68B0613B9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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:References:In-Reply-To: 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: List-Owner; bh=AuaOqVBeCgxAAd6w53HUU1lgLpFMsQtPKYVdf1lPEFg=; b=P0jAP60kyXrvjW wxRRTG4Ba+D46rR6cahIKiQ+/AiBG+CI2DN2vsuRq1JnXwRJfmtJD3lq4bbe7640Wt7deGMfE3PxW mdt4nU6/Jj7GtIKBWWbMzRM9CLhIcCBPyXDao4m/TcO27JUoosKFhXyIKZ7u4GaAv/BVXWQsCOBTp BqGa5uIypg/diiS2cGey9jb8cC+WcEtDGYWMVViIxJuvwMNmN5Xn+HQrYQAXiUvQ6pvl4NxjHrpfs YfhFgGv9qMI0+vq/ZBgd7adpZ7OtjlURM4KV2h9VMlv/xmeLT3ZactDG9B0LU+ABb/BG11hQe7ByY JGezyzxtGwWtFtsirz8A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m0BZy-00770x-Vm; Sun, 04 Jul 2021 23:31:16 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m0BCa-006uEK-AP for linux-arm-kernel@lists.infradead.org; Sun, 04 Jul 2021 23:07:05 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 467D46194A; Sun, 4 Jul 2021 23:07:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625440024; bh=Vys9mD3EkaYftCei4LNcZ76AI27GxMfOdMxo5nT9LRM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SV/7DI1R/eDzJ8DcGtWXvjwXJPHbbP8T/4dRV8TmgoWyfXiA/9W+UxqHszT5yV2kk p9vDEj/883OkxRD5lw+04E1PGs+LHJQfDvrx2sZFpPDimN5GmriZhVFqFZ0ufSfXCM 5eKRWlr8ykC6R7ycQk0cptwAfjV9xm16RUcPaZgpq1d1WTBzI9+01DFzbiO0EQuPba d0mgwnHSDnuJkN27+7WQJJGRMS5UFQD6AWIbG71BAJV0cP4TXsyDM2oxOtYFyNS9dl FGunRFmXv7/Y6qMDKATyPNyJqUC/UISWbHRLPqHorW4cnbbrsti2xZppKZ7dQut/rX S1o+K56YOUh2g== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Tian Tao , Will Deacon , Sasha Levin , linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.12 34/80] arm64: perf: Convert snprintf to sysfs_emit Date: Sun, 4 Jul 2021 19:05:30 -0400 Message-Id: <20210704230616.1489200-34-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210704230616.1489200-1-sashal@kernel.org> References: <20210704230616.1489200-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210704_160704_438285_BE41440F X-CRM114-Status: UNSURE ( 9.85 ) X-CRM114-Notice: Please train this message. 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 From: Tian Tao [ Upstream commit a5740e955540181f4ab8f076cc9795c6bbe4d730 ] Use sysfs_emit instead of snprintf to avoid buf overrun,because in sysfs_emit it strictly checks whether buf is null or buf whether pagesize aligned, otherwise it returns an error. Signed-off-by: Tian Tao Link: https://lore.kernel.org/r/1621497585-30887-1-git-send-email-tiantao6@hisilicon.com Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- arch/arm64/kernel/perf_event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c index 4658fcf88c2b..3baca49fcf6b 100644 --- a/arch/arm64/kernel/perf_event.c +++ b/arch/arm64/kernel/perf_event.c @@ -312,7 +312,7 @@ static ssize_t slots_show(struct device *dev, struct device_attribute *attr, struct arm_pmu *cpu_pmu = container_of(pmu, struct arm_pmu, pmu); u32 slots = cpu_pmu->reg_pmmir & ARMV8_PMU_SLOTS_MASK; - return snprintf(page, PAGE_SIZE, "0x%08x\n", slots); + return sysfs_emit(page, "0x%08x\n", slots); } static DEVICE_ATTR_RO(slots); -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel