Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp263373ybi; Wed, 29 May 2019 20:56:29 -0700 (PDT) X-Google-Smtp-Source: APXvYqzEmNjaDRH5CMj8cbVqa9Oq04kdWPV/G1VpfCmTBvy8QOFMMuDQQi5evfbu6uVTiEg1K81Z X-Received: by 2002:a17:90a:33c5:: with SMTP id n63mr1571241pjb.16.1559188589180; Wed, 29 May 2019 20:56:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559188589; cv=none; d=google.com; s=arc-20160816; b=scUPHOzQhwhRsAm4x1F1WBp/hchOz8vP2YausBgvBxakPrRoxA0wU6YCurSTThZ9rc OoU/I5BvHsuTxJ2HRkKCfdSk2IbQzLXiKJm9Qa4Bu7x3sdx12pMeJ5egf/ay33LQy6bp sRdeoKm6+b5APaXMzBPGR9Yiwdt+xI5a8vmoqHcXIGWvGEtr74hdFnHstE+wrE28wP1B OhWeMUlHS4c4UQJi7msmNbMeVCGlUj0yxaJ8EntqJ+hgnG0vbyC+AfTi09hczOFfEU5O P7Xdvjb5vVnzqjpGE8haADSWzmc3VwQmLTR4Ig3IWNkzgZmutyrmc2mTtG0VxCqRbhlH ZOJA== 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=NNzl9P2yT/v/IVjy9zsg/DuUyo+GmvybhD+x4nuuLB0=; b=VyfvDqdra6iS9XIXgl/iQWPLJKKgzz1E58R+KwWVS42jbebfOxREzh6OEDXSSLebvT v7Wl9jUzLWGlYxwoLlzLKcAZW2DUGet5IOefg5IDcIGatO2jFRCgA0OYkxlKvHYmO1QR 9lwnxK2Hycwo1v1+Jm5Bo2MLU6YnNxxmugvbPDwtF5JSvy0QDKbCEVfMYyFKIQOPXB6y PhiSzw5VVb+/PZ89Gzp8ApiwOatKa98QTNylStbyDg9hUAYCdA/Xb+pTPEk6k1hSvBt6 vmdyTIZyCJbejgrNplDs54gQUMaGEbp8iR33s5PXtUWt1CSm2toDBsJEtMyimfflIGTr UEtg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=X9nqEoAG; 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 t7si1989145pgu.3.2019.05.29.20.56.13; Wed, 29 May 2019 20:56:29 -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=X9nqEoAG; 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 S1733277AbfE3Dyh (ORCPT + 99 others); Wed, 29 May 2019 23:54:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:54624 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731857AbfE3DTS (ORCPT ); Wed, 29 May 2019 23:19:18 -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 AA02424849; Thu, 30 May 2019 03:19:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559186357; bh=27AnvQp6V1UBvA8YUZr5d1qzCcobTE+49gHKQuYrNho=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X9nqEoAGNFATa2OcGFF+HQCe+235D/PgGdtQ/CzZ8mQgUt6cLEtfo0ostAGMcLCr6 HBT058KCY3jG6RoKJmpRfHY2HOg8c00UeBPFgC99jXY5nuA+TkoAEY2Ps0jWN9IZDt NOhQUHqiWWTr3Gt6VoJ2dNRtB88UAtjR12GH++hs= 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 101/193] sched/rt: Check integer overflow at usec to nsec conversion Date: Wed, 29 May 2019 20:05:55 -0700 Message-Id: <20190530030502.959142662@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 1a010e29cfa00fee2888fd2fd4983f848cbafb58 ] Example of unhandled overflows: # echo 18446744073709651 > cpu.rt_runtime_us # cat cpu.rt_runtime_us 99 # echo 18446744073709900 > cpu.rt_period_us # cat cpu.rt_period_us 348 After this patch they will fail with -EINVAL. Signed-off-by: Konstantin Khlebnikov Acked-by: Peter Zijlstra Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/155125501739.293431.5252197504404771496.stgit@buzz Signed-off-by: Ingo Molnar Signed-off-by: Sasha Levin --- kernel/sched/rt.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c index cb9a5b8532fa5..cc7dd1aaf08e3 100644 --- a/kernel/sched/rt.c +++ b/kernel/sched/rt.c @@ -2533,6 +2533,8 @@ int sched_group_set_rt_runtime(struct task_group *tg, long rt_runtime_us) rt_runtime = (u64)rt_runtime_us * NSEC_PER_USEC; if (rt_runtime_us < 0) rt_runtime = RUNTIME_INF; + else if ((u64)rt_runtime_us > U64_MAX / NSEC_PER_USEC) + return -EINVAL; return tg_set_rt_bandwidth(tg, rt_period, rt_runtime); } @@ -2553,6 +2555,9 @@ int sched_group_set_rt_period(struct task_group *tg, u64 rt_period_us) { u64 rt_runtime, rt_period; + if (rt_period_us > U64_MAX / NSEC_PER_USEC) + return -EINVAL; + rt_period = rt_period_us * NSEC_PER_USEC; rt_runtime = tg->rt_bandwidth.rt_runtime; -- 2.20.1