Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp246787ybi; Wed, 29 May 2019 20:34:36 -0700 (PDT) X-Google-Smtp-Source: APXvYqzXt2biVqXNvxkAclvH5Y2sxDn/3+H3N7GzMPnC4gGh+JF4ToiFiQKIRC0YJ320PigRK/Xd X-Received: by 2002:a62:8893:: with SMTP id l141mr1422854pfd.261.1559187276429; Wed, 29 May 2019 20:34:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559187276; cv=none; d=google.com; s=arc-20160816; b=LcT3g6ShLnjS0fUEFIcc+uFNAgmhdRUqY7Zht6kEXiGnVGzwZc6ojfpd20qrnh9XYR +/Xi/7GHMPV55MI6TVcfZSIb4CTLiBpffjad4yw6GktGxfOCUZZ7w1DVxqTwO0iiAHDu D2E2s7YwG0SBMS7xbWH2JTYIz7a4xOgPe2DZvKCZgYdiNm7TVeO4SuQapVzh91SsBiTK gEOx2oOFMOahYlebMpCqcY99DxrG7dyn5fcwPTAo6uKWf4Jj7Svzlkx0NeTVVeEBbfN9 WzD1vBkKRgFQ703BSdhSZOzh13z0oAG6YDLXywwXc1QOaIw0pYF6LugOMNHxgtfnXLJE gtmA== 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=ig95quD6YKuHQV7TY5GL/gotAFNCdYJWMK0syuFVhkQ=; b=ofhYpc82h8Rscg0Osl8IoI4hYoWvE4w4TNzcpJxT1PIvQi1FeL2DrroVOBdZnC/qu2 PLzAFPXB6jkncvLXtH6dnVs9MskGGY7T8qLB1uwxNdLtYn8JIVjofG5iv0UQyhenZoKv mQtLYCakTyjm46iwRHuV44cBQukdtyhpGsCWat3GPdYoru2WhZtooDoy6FJGT5AjhRll lLie5GrU+jBbSOJIVWDOYSfV5G3De4LEIjhmz94jQNBrdqbBJIHH3wNInDJqVgSYI7Su dLscadhIAhocfUItVZue/1lSvOzEy44l7c5+Zdh4E/COl2X+08KZkR22ZQ9CyGmzpoQr chAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="QDT8rs/e"; 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 n1si1876169pgh.584.2019.05.29.20.34.19; Wed, 29 May 2019 20:34:36 -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="QDT8rs/e"; 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 S2388442AbfE3D3v (ORCPT + 99 others); Wed, 29 May 2019 23:29:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:60480 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731196AbfE3DUy (ORCPT ); Wed, 29 May 2019 23:20:54 -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 31C082497C; Thu, 30 May 2019 03:20:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559186454; bh=x7O6KTT0FirLGwU3C2fSs6asJYzlStlvS11JObgv65M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QDT8rs/ewb3erzbF+YTTKUJTAMpXl719dEp4qSgd7jkdAoSUAhnLRStF2TUfJQmXM pMo3TLyDPr/xqEhujhPKcNiv8z/qdoXW/1jZJ761xSGhIzioAqQJmzaN4crOBbXMDv i/iWH0aCd800NNVZK1/1RKdLnYUqSDEI4ludo0vs= 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.9 066/128] sched/core: Handle overflow in cpu_shares_write_u64 Date: Wed, 29 May 2019 20:06:38 -0700 Message-Id: <20190530030446.697768355@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190530030432.977908967@linuxfoundation.org> References: <20190530030432.977908967@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 4617ede80f020..3861dd6da91e7 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -8512,6 +8512,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