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.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,T_DKIMWL_WL_HIGH,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 1FA62C28CC0 for ; Thu, 30 May 2019 04:28:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EE1CA25504 for ; Thu, 30 May 2019 04:28:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559190492; bh=oydYdC0NqSDUA9GLPTTmL9wL9pNRkReA8vZR24mINLw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=p6V0f4H3EKlttvyyU2a8EJ+iYjgVXI9/1NELOSKBTtwGcUC9i9s7LXEH881BXKZLT JJw84Jn+RmG2/eolvAKZxKdfUNqtJ8v7Tk/RA1sC0XCcoAZGWAqdmKEAUsfV6NfijG zbNOTuIcCieyuOb/0TYtJGYKJ7+byb8HsmRNd0to= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729799AbfE3E2H (ORCPT ); Thu, 30 May 2019 00:28:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:33726 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728145AbfE3DOQ (ORCPT ); Wed, 29 May 2019 23:14:16 -0400 Received: from localhost (ip67-88-213-2.z213-88-67.customer.algx.net [67.88.213.2]) (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 24A8C2455E; Thu, 30 May 2019 03:14:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559186056; bh=oydYdC0NqSDUA9GLPTTmL9wL9pNRkReA8vZR24mINLw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nhQ3uw8X+aDe50OohTGQGsTtDMQjT67QxzvPrpWK6y24wYIr2x9CIcFpwzZ31uo0q Hx/liBhNeuW89d713VigJEHZytjB7Fswc1N7Xa/bZfC4XLCDzKbr/QaW3/mZU5yVxW ahWL8VoR9b/qf/hEv2BKUJmzVt0CS6xjcMLnt9cY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Konstantin Khlebnikov , Peter Zijlstra , Linus Torvalds , Peter Zijlstra , Thomas Gleixner , Ingo Molnar , Sasha Levin Subject: [PATCH 5.0 155/346] sched/core: Handle overflow in cpu_shares_write_u64 Date: Wed, 29 May 2019 20:03:48 -0700 Message-Id: <20190530030549.030446153@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190530030540.363386121@linuxfoundation.org> References: <20190530030540.363386121@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit 5b61d50ab4ef590f5e1d4df15cd2cea5f5715308 ] Bit shift in scale_load() could overflow shares. This patch saturates it to MAX_SHARES like following sched_group_set_shares(). Example: # echo 9223372036854776832 > cpu.shares # cat cpu.shares Before patch: 1024 After pattch: 262144 Signed-off-by: Konstantin Khlebnikov Acked-by: Peter Zijlstra Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/155125501891.293431.3345233332801109696.stgit@buzz Signed-off-by: Ingo Molnar Signed-off-by: Sasha Levin --- kernel/sched/core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 55c1061b5aeb1..9346e2ce0ac03 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -6503,6 +6503,8 @@ static void cpu_cgroup_attach(struct cgroup_taskset *tset) static int cpu_shares_write_u64(struct cgroup_subsys_state *css, struct cftype *cftype, u64 shareval) { + if (shareval > scale_load_down(ULONG_MAX)) + shareval = MAX_SHARES; return sched_group_set_shares(css_tg(css), scale_load(shareval)); } -- 2.20.1