From patchwork Mon Oct 2 13:33:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 147500 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp1713715vqb; Mon, 2 Oct 2023 15:00:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEoJDlwyVLPjOgNcVVlsBnGZGs8L0QO9nzwkTfhoFI5b480OSzO1qoKFXAGDwTbD90FfrDG X-Received: by 2002:a17:902:74c7:b0:1c0:9b7c:f82a with SMTP id f7-20020a17090274c700b001c09b7cf82amr13642143plt.53.1696284056045; Mon, 02 Oct 2023 15:00:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696284056; cv=none; d=google.com; s=arc-20160816; b=g4dk5qdo9rROV11ChwdJ35ruwaUeunsqe0saHVt0g/Dp2ahgdBMSWLp1+DGfN5qPWm BA0rRxbkEFzeXrnUS5OGzJOxbU6V/zCUL58l4dVrsfuGPOzD9/de34YdK7mgw9qg6gTq wHFxyItNxaiD2XU8ipqLtpV+lDKjiqgMRauHfI56xPjKbnnke63pSIlEB3ld1VSvtXQP PHGkMn/PteNUTHhLnRdw1GePYYvepBGwkwuEns9HQ/W4uZAG+h5JvgLJlLHLtKSsdHFi 0Ry1dvNY6IENtMN/Y1d3JcPiQktSzPEa00wT07NtnmovDdDorpLgG00y9tC7dzSXpY58 3s3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=P0p2vR7BHS9RuTDzTxnJMgzinuQb+pJ7BDAsPRKwgIQ=; fh=LcOZopNn7gm+JFHHAZk0tCihMQOZoWWYJXDCojcFWBU=; b=bQHjKNGXpCdUPJyw49MotnFA1pbgKKFMiPo3WnGtiFD2n/zzFkwtorTCEws4CCXHJk Ug5AAHP9TenGQfr0LC5prekyE2d6rssONmgqYgR9AA77PMZOwT1NYTf1896pS31qxM+W f8D5Z84YBwKXqMhiI6PpxNvcfGyMKv1+DtEeKmLlXrOz3ZbzPc75Zjp27renprd60mzp 3/A71oALr+Uu1zX6U4upOPjjxInK4QXwJEBrA/hgSIIICqU1TUlnH+Ey2IN494U13vdV UdBxnAV6J4iS28xt0Ae9M/UILgdfYkQcydO60vgYDYSyVFtgdEc34VVWPT0rzQ37ipeU wRNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=R6yncCiP; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id t12-20020a1709027fcc00b001bbd70bdffbsi13158687plb.440.2023.10.02.15.00.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 15:00:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=R6yncCiP; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 36CA28022C0E; Mon, 2 Oct 2023 06:34:57 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237447AbjJBNeI (ORCPT + 18 others); Mon, 2 Oct 2023 09:34:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56272 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236712AbjJBNeC (ORCPT ); Mon, 2 Oct 2023 09:34:02 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F291FB4; Mon, 2 Oct 2023 06:33:59 -0700 (PDT) Date: Mon, 02 Oct 2023 13:33:57 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1696253638; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=P0p2vR7BHS9RuTDzTxnJMgzinuQb+pJ7BDAsPRKwgIQ=; b=R6yncCiP0jLQi4K/8Pj8jlk/k7VAeNo2Ua+3vwgfYrqiOW/bB4kAgxVdr0xxHrPccW0n/g TJbfj+JgkivLmtF3MtVKitGhXe5xm8dNjloWRw6zNO4ESuGE+7+tby+r9bG05Y2bxxaWo6 3RZ//VbWRiIZvASn605bygrK3Ms+w5QhHZsWN9hbgYRmRlizLp8TtZLPU4qwpKv6WKHBIY lxq5uiSXywDzkreWi7eXvM5lL6FOT6otRfiHtaG/VUe+V2XtEMEmT4/wVNtG4pcMVemMo2 kc3A1rRPEM70Xy0ywJwv0alw5dNHMJu1tbne8HYMyMKGvBIJAoUCE6j6HgT0qQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1696253638; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=P0p2vR7BHS9RuTDzTxnJMgzinuQb+pJ7BDAsPRKwgIQ=; b=DVt8K2eyBHkvQmmPTMKC759va635RCTbRzcYNHQb/dZ8WVRX7v0bpfqVltInNQOVEBCBr+ LMjZZpusCSwMGaDg== From: "tip-bot2 for Cyril Hrubis" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: sched/core] sched/rt: Disallow writing invalid values to sched_rt_period_us Cc: Cyril Hrubis , Ingo Molnar , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20231002115553.3007-2-chrubis@suse.cz> References: <20231002115553.3007-2-chrubis@suse.cz> MIME-Version: 1.0 Message-ID: <169625363764.3135.15928031760457395657.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Mon, 02 Oct 2023 06:34:57 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778682600606271619 X-GMAIL-MSGID: 1778682750021012230 The following commit has been merged into the sched/core branch of tip: Commit-ID: 079be8fc630943d9fc70a97807feb73d169ee3fc Gitweb: https://git.kernel.org/tip/079be8fc630943d9fc70a97807feb73d169ee3fc Author: Cyril Hrubis AuthorDate: Mon, 02 Oct 2023 13:55:51 +02:00 Committer: Ingo Molnar CommitterDate: Mon, 02 Oct 2023 15:15:56 +02:00 sched/rt: Disallow writing invalid values to sched_rt_period_us The validation of the value written to sched_rt_period_us was broken because: - the sysclt_sched_rt_period is declared as unsigned int - parsed by proc_do_intvec() - the range is asserted after the value parsed by proc_do_intvec() Because of this negative values written to the file were written into a unsigned integer that were later on interpreted as large positive integers which did passed the check: if (sysclt_sched_rt_period <= 0) return EINVAL; This commit fixes the parsing by setting explicit range for both perid_us and runtime_us into the sched_rt_sysctls table and processes the values with proc_dointvec_minmax() instead. Alternatively if we wanted to use full range of unsigned int for the period value we would have to split the proc_handler and use proc_douintvec() for it however even the Documentation/scheduller/sched-rt-group.rst describes the range as 1 to INT_MAX. As far as I can tell the only problem this causes is that the sysctl file allows writing negative values which when read back may confuse userspace. There is also a LTP test being submitted for these sysctl files at: http://patchwork.ozlabs.org/project/ltp/patch/20230901144433.2526-1-chrubis@suse.cz/ Signed-off-by: Cyril Hrubis Signed-off-by: Ingo Molnar Link: https://lore.kernel.org/r/20231002115553.3007-2-chrubis@suse.cz --- kernel/sched/rt.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c index 3b627ab..88fc986 100644 --- a/kernel/sched/rt.c +++ b/kernel/sched/rt.c @@ -37,6 +37,8 @@ static struct ctl_table sched_rt_sysctls[] = { .maxlen = sizeof(unsigned int), .mode = 0644, .proc_handler = sched_rt_handler, + .extra1 = SYSCTL_ONE, + .extra2 = SYSCTL_INT_MAX, }, { .procname = "sched_rt_runtime_us", @@ -44,6 +46,8 @@ static struct ctl_table sched_rt_sysctls[] = { .maxlen = sizeof(int), .mode = 0644, .proc_handler = sched_rt_handler, + .extra1 = SYSCTL_NEG_ONE, + .extra2 = SYSCTL_INT_MAX, }, { .procname = "sched_rr_timeslice_ms", @@ -2935,9 +2939,6 @@ static int sched_rt_global_constraints(void) #ifdef CONFIG_SYSCTL static int sched_rt_global_validate(void) { - if (sysctl_sched_rt_period <= 0) - return -EINVAL; - if ((sysctl_sched_rt_runtime != RUNTIME_INF) && ((sysctl_sched_rt_runtime > sysctl_sched_rt_period) || ((u64)sysctl_sched_rt_runtime * @@ -2968,7 +2969,7 @@ static int sched_rt_handler(struct ctl_table *table, int write, void *buffer, old_period = sysctl_sched_rt_period; old_runtime = sysctl_sched_rt_runtime; - ret = proc_dointvec(table, write, buffer, lenp, ppos); + ret = proc_dointvec_minmax(table, write, buffer, lenp, ppos); if (!ret && write) { ret = sched_rt_global_validate();