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=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 2817FC43381 for ; Sat, 30 Mar 2019 01:06:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ED79E206DD for ; Sat, 30 Mar 2019 01:06:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553907975; bh=t0UkHPUNSywfB4fEO3vyA7A8ScZSqk4+KfYx5LEbmzo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=s1WjIF7kFSjqSrn01iJJHpBn8YE57yKGjVrRsfyp4fM+LD2SFQervh19GBhFSutMD s4ku7XTvsR5cKtU0iLXrCvPda4jOjgX/uD1UfIq9+Kq3uABp+/mvR9HxyaUKySnpXn VU/IRpwOFgW0JCu+Vb4/nbghZ767Piw04/fDW2/0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731338AbfC3Axo (ORCPT ); Fri, 29 Mar 2019 20:53:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:60604 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730839AbfC3Axo (ORCPT ); Fri, 29 Mar 2019 20:53:44 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1811C218CD; Sat, 30 Mar 2019 00:53:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553907223; bh=t0UkHPUNSywfB4fEO3vyA7A8ScZSqk4+KfYx5LEbmzo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wmJiMghJ5CRYTlhsBjWk3XSviU+el9kIseG4E4b01H7K9pAnm4CbkRlHN58lD1CTO Q2xbwVhXoYqNfEmurn6x5NEBiWxV8ybK36B+koB88OkY5noCgD5sNXycGIjrXqMnck cSjn24xNKQJuWvavO+1drU+BkL+VQZd0Z0HjVNuU= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Konstantin Khlebnikov , Peter Zijlstra , Andy Lutomirski , Borislav Petkov , Dave Hansen , "H . Peter Anvin" , Johannes Weiner , Li Zefan , Linus Torvalds , Rik van Riel , Thomas Gleixner , Ingo Molnar , Sasha Levin Subject: [PATCH AUTOSEL 4.19 25/52] sched/core: Fix buffer overflow in cgroup2 property cpu.max Date: Fri, 29 Mar 2019 20:52:32 -0400 Message-Id: <20190330005301.26868-25-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190330005301.26868-1-sashal@kernel.org> References: <20190330005301.26868-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Konstantin Khlebnikov [ Upstream commit 4c47acd824aaaa8fc6dc519fb4e08d1522105b7a ] Add limit into sscanf format string for on-stack buffer. Signed-off-by: Konstantin Khlebnikov Signed-off-by: Peter Zijlstra (Intel) Acked-by: Tejun Heo Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Dave Hansen Cc: H. Peter Anvin Cc: Johannes Weiner Cc: Li Zefan Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Rik van Riel Cc: Thomas Gleixner Fixes: 0d5936344f30 ("sched: Implement interface for cgroup unified hierarchy") Link: https://lkml.kernel.org/r/155189230232.2620.13120481613524200065.stgit@buzz Signed-off-by: Ingo Molnar Signed-off-by: Sasha Levin --- kernel/sched/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 152a0b0c91bb..33e7557fe8e3 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -6929,7 +6929,7 @@ static int __maybe_unused cpu_period_quota_parse(char *buf, { char tok[21]; /* U64_MAX */ - if (!sscanf(buf, "%s %llu", tok, periodp)) + if (sscanf(buf, "%20s %llu", tok, periodp) < 1) return -EINVAL; *periodp *= NSEC_PER_USEC; -- 2.19.1