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,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 780E8C282DD for ; Thu, 18 Apr 2019 18:11:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4AE6321871 for ; Thu, 18 Apr 2019 18:11:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555611070; bh=f66SDBxJ92CaD4EXd4mkVOlyCUadXdzmnULD5beLgtw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mHHiPBzfTvtJCQWQG+IHhn69pNBV1PvQl3vGB0zJaIlsBUx8uep5eFSvLBb1Fnn39 1IkHTv/zpdeHxt8WxXzgPIamjJYrHzu7CmE4WGEQ7DKAfPTht04x1UPFcGIraDxZdi rE8rXuGf/cnNK48AZ+qwzqQBNAQ76czaL5TN2OA4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391805AbfDRSLJ (ORCPT ); Thu, 18 Apr 2019 14:11:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:43112 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391278AbfDRSLE (ORCPT ); Thu, 18 Apr 2019 14:11:04 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2DD8A20652; Thu, 18 Apr 2019 18:11:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555611063; bh=f66SDBxJ92CaD4EXd4mkVOlyCUadXdzmnULD5beLgtw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GPhVQiWUksj0DUGX5NEiIN5ffUYF9X4Im3B/n7mfvW7fuabLcuaKAb8qqKhk9ABdN DCFooytcPgJxMu64tfxkD+i5dt+k/fDahHLg5JoyuNmKNbEOE4W81g3mrzMVSrCy1X ANDGMgGTVx+p234glJFtFCuNiorBzoL612rxK4G8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Konstantin Khlebnikov , "Peter Zijlstra (Intel)" , Tejun Heo , 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 5.0 28/93] sched/core: Fix buffer overflow in cgroup2 property cpu.max Date: Thu, 18 Apr 2019 19:57:06 +0200 Message-Id: <20190418160439.740438937@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190418160436.781762249@linuxfoundation.org> References: <20190418160436.781762249@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ 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 01a2489de94e..62cc29364fba 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -6942,7 +6942,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