Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp248699ybi; Wed, 29 May 2019 20:36:59 -0700 (PDT) X-Google-Smtp-Source: APXvYqyOFYICvaBxs4lZKMr4lfK4WKS9jpmcIrKqzYSi1tQ2jMOTZEAq5TpnWpSjsz3BvPvHnCrY X-Received: by 2002:a65:5304:: with SMTP id m4mr1727220pgq.126.1559187419065; Wed, 29 May 2019 20:36:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559187419; cv=none; d=google.com; s=arc-20160816; b=HLrhWbpIXpkcyRSBWKqdJ0ZKije1x7IdnfViRtPsUYVoT+zXqX2xCxqfVruj/jBU8j 41MYrSSb7RFpQe6RBHNPwlPEk56GYN/I6F1fDeK6AQ4geFu2K1AH4qMF3icJ8UvzJy62 HawYetJGivVYlhKQsdAhjfrhrNB/CYryoxaoKGmIac7K6pNek3ZLzBiqhZVUEowS0+am Mt3X1h4gofzE4iKpF4qySsHhpb/yo1YpbP50mL8hnNDNcovCGE6riHTmcIcox+Hkk062 eobnE928HpgxfWpMr1P70HsPktv+LyLVpuq5P+B6NcVhXxWZdzwlJ9qqVrUrFrF6PRb+ e1Eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=+AfQ+6/R8/zaN9P4e1fIzHArtZuGCVVxc5gik6Vlup0=; b=C0JpnEAU/6cbPYh9UWEQe4K45Kea8PUd9dNBu6alfjc6NnL8Hi59NkuleLRW7CIXFL bEkDDk1KR75q+2koFb/BDrjTF+rhE5PRvQACmq7jsHqQkTLTmnMMrhpFu1/JbGE0L36i B7JpbzINceo7hYzme7htkPSQ6AFTTBU0nMB4klQcjEtkkKRMVGr5KNKzd95ZGXuKeqov w1SLOskdLv/pvVOQNtF2DL3nDi/wttMojNKQzPWYVoklrxoDEoyIypworUATZbcPBvLL 3eYeIxaFycS/PJscCGA7pMbawfx/eNNxO/5c3Rg3SToLYR0SCkKLf3CWB8mJTtqePbgk oUhg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=W5oBbjwx; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x2si1891758pgf.505.2019.05.29.20.36.42; Wed, 29 May 2019 20:36:59 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=W5oBbjwx; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387931AbfE3D1O (ORCPT + 99 others); Wed, 29 May 2019 23:27:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:54664 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731860AbfE3DTT (ORCPT ); Wed, 29 May 2019 23:19:19 -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 56D4E24831; Thu, 30 May 2019 03:19:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559186358; bh=slVuyKV+KlKo7Zs7N/nUpeypBEk7xTvR2V2HDd9lqPw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W5oBbjwxfkQfTFxlZhhBX5tcqabf7EaS/HYXjxMSpjfbsCzWzri3m8oNv4mwWEZm+ dQfmR+gibdoONSyI1/+8gpHbo/+yWC4tcvgHNQ1RTGrGKfwKz+Uj9YPW+yUwI0HrR1 BlE/HQ0XsYqKfh5kRf3okShxah6ydYgl8O99O69g= 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 4.14 102/193] sched/core: Handle overflow in cpu_shares_write_u64 Date: Wed, 29 May 2019 20:05:56 -0700 Message-Id: <20190530030503.072210829@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190530030446.953835040@linuxfoundation.org> References: <20190530030446.953835040@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 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 2464a242d6c9d..b3ff73d6a4c23 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -6380,6 +6380,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