Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp2824204pxv; Mon, 12 Jul 2021 02:50:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwrKPShI++5WtT2VJHReZFAP7NitrT/hKt6HIUWYQojnEkPOaqlWw8STx+z2X4xfmQa9HZm X-Received: by 2002:a92:c524:: with SMTP id m4mr13651376ili.42.1626083448234; Mon, 12 Jul 2021 02:50:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626083448; cv=none; d=google.com; s=arc-20160816; b=TtY9Y1aBZES0uTXJ2er6dV2iGTG+FAdUoQ9PyOzH9g+mSDDPcR6fsgtPSUJKsEYV0Y qsyKXaahz6EzaSzg7sdq2Ai15U5XL68BStS1fNlzzgLMh1mLyR9vJ5vhvrs4GDjB3WwV JMEPzL4LfTkzQ58pFuIQiaSnL3zkOW9s1ARcn+R22LVj8N1zIZgwNBZgvz+uV3j69q2y uPGxj8zTRagWlzcvDySSEthnxy4Dain5+q2sUZUgLGfCP38/TQCuyfb4JSLHDN2i0HpA kX5WudMHJK4EXKrvZf98HAnEneTtAOQgukD4kVSHILNeXESKeUdiBNf6/mA+ok0WUdqS Z5Yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=w7i4uPlM35WrPX/dfTnDYRHPX5O7WfY0XSX5RiNYesA=; b=zqzd/dWDbWin+Nx/sY5uOqHff0WyTlGlzNbrVhXaMUwjsC+rGF/EJ1iSXwYzg7BJkr XxulUyssFtFAxSlBDXxEGqWtxUWSYx5n5FE88rD5UbNzApYUUEO2b1XNB/s0PY9kUU9B RP/HROUHd8JGiQOBiLm4Wbcy5XO8FTVVTbIJ3+uAqHh9V+vFTgvge2225ICk94WxcEsE HhXc3+opCdTE2L3O8Qx0Ru1efMJyMPa/OhJIG1sE9dCjFIuvftBA9G33d/XJNGy9pZoz hCsZ6pSCWybawV2f6T3ypriZBn7MNFxAJJd8r4Pil9jMWqt2ooiMZVH6CUDhguQKGBba peFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="R6ks/sYi"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w13si16572186jar.0.2021.07.12.02.50.36; Mon, 12 Jul 2021 02:50:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="R6ks/sYi"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236798AbhGLGqj (ORCPT + 99 others); Mon, 12 Jul 2021 02:46:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:58304 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236088AbhGLGfy (ORCPT ); Mon, 12 Jul 2021 02:35:54 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D3955610A7; Mon, 12 Jul 2021 06:32:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626071579; bh=kUZsgb8dfS/8kleJfRU5m1xSp/sKoanlCexjaXBYWZo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R6ks/sYiV3LtQ55qxpndu6L5xyjO9QnvGBDyhL0QqxoLeUSPAZd3wnvw2dBNGVe2g 9sbtfrXFB3EeVtUfKllsAloiAXNRr0fRXPrTuKby7HebHUxdbfEm4wwWUTP5c9s4yI 2JSnVONJeAAT2EzCx7azYLrwD+oFWYlIKeTU1zjc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tian Tao , Will Deacon , Sasha Levin Subject: [PATCH 5.10 130/593] arm64: perf: Convert snprintf to sysfs_emit Date: Mon, 12 Jul 2021 08:04:50 +0200 Message-Id: <20210712060857.436400368@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060843.180606720@linuxfoundation.org> References: <20210712060843.180606720@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 11852e05ee32..cdb3d4549b3a 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