From patchwork Tue Aug 9 23:54:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 73592 Delivered-To: patches@linaro.org Received: by 10.140.29.52 with SMTP id a49csp136220qga; Tue, 9 Aug 2016 16:54:24 -0700 (PDT) X-Received: by 10.98.135.13 with SMTP id i13mr1817595pfe.44.1470786864160; Tue, 09 Aug 2016 16:54:24 -0700 (PDT) Return-Path: Received: from mail-pa0-x236.google.com (mail-pa0-x236.google.com. [2607:f8b0:400e:c03::236]) by mx.google.com with ESMTPS id n81si45167350pfb.192.2016.08.09.16.54.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Aug 2016 16:54:24 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c03::236 as permitted sender) client-ip=2607:f8b0:400e:c03::236; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c03::236 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by mail-pa0-x236.google.com with SMTP id fi15so9686415pac.1 for ; Tue, 09 Aug 2016 16:54:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=z7xcDaTh/JO9hem84mVjwfx8LWTfOQhutQCEy6bvNlU=; b=R6P9loQBVzV1gsApZsT49mzU67xsHfA57JHuojutwKT6PV0pBCvZtNe1FyvXV+j42x MHtifZbozW9aqev89Oy14H5jH9bYpNwnFP+9RzubuWbE3pmRfaQ2BhsSmcx6wREb+rg1 ZKaE1aub5iuKgaUn4PDHNf+BNCk6XiBQg2VKI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=z7xcDaTh/JO9hem84mVjwfx8LWTfOQhutQCEy6bvNlU=; b=YBL0F/HWDfqJIL+87qOawvKl2R57nD8U7JBwyCSS9cWDfrDxC1kwDWfVvj50anMDW3 8CXO/kCL0DdbKsTd5zClH0ljS1eg2bBgPz4b+TrdUfbhhgewYEXnaDCO9047LoqDsRK1 bDq6b+TfVdNiXudqH7eeCRzEmIev9/N0auOTYFIGaaAvnDdo61Wm55s7ug1bO/ERF0mt 0W6BVxz0Tq24pr3XYTckqjUkJGwzXfaYRDPzNjgQq6lCLAXKnmRs3cy57t1qMTARJiw2 Kqji3SamHce30cl2UGBXQiprgWkM5hbKPSTLcgr0/QIrv5rlrQ9itTfcRmKudF6CEQX5 xO/g== X-Gm-Message-State: AEkooutK7h+RxCYZG7ASQY1iPTGz5W4zYpLAn4PghtEXNB2l4wdQxJ24MXCKoZwBpDaQMU8xkKU= X-Received: by 10.66.181.139 with SMTP id dw11mr1859205pac.2.1470786863833; Tue, 09 Aug 2016 16:54:23 -0700 (PDT) Return-Path: Received: from localhost.localdomain (c-73-67-244-238.hsd1.or.comcast.net. [73.67.244.238]) by smtp.gmail.com with ESMTPSA id d5sm58544314pfc.4.2016.08.09.16.54.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 09 Aug 2016 16:54:23 -0700 (PDT) From: John Stultz To: lkml Cc: John Stultz , Kees Cook , "Serge E. Hallyn" , Andrew Morton , Thomas Gleixner , Arjan van de Ven , Oren Laadan , Ruchi Kandoi , Rom Lemarchand , Todd Kjos , Colin Cross , Nick Kralevich , Dmitry Shmidt , Elliott Hughes , Android Kernel Team Subject: [PATCH] proc: Fix timerslack_ns CAP_SYS_NICE check when adjusting self Date: Tue, 9 Aug 2016 16:54:17 -0700 Message-Id: <1470786857-27366-1-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.9.1 In changing from checking ptrace_may_access(p, PTRACE_MODE_ATTACH_FSCREDS) to capable(CAP_SYS_NICE), I missed that ptrace_my_access succeeds when p == current, but the CAP_SYS_NICE doesn't. Thus while the previous commit was intended to loosen the needed privledges to modify a processes timerslack, it needlessly restricted a task modifying its own timerslack via the proc//timerslack_ns (which is permitted also via the PR_SET_TIMERSLACK method). This patch corrects this by checking if p == current before checking the CAP_SYS_NICE value. This patch applies on top of my two previous patches currently in -mm Cc: Kees Cook Cc: "Serge E. Hallyn" Cc: Andrew Morton Cc: Thomas Gleixner CC: Arjan van de Ven Cc: Oren Laadan Cc: Ruchi Kandoi Cc: Rom Lemarchand Cc: Todd Kjos Cc: Colin Cross Cc: Nick Kralevich Cc: Dmitry Shmidt Cc: Elliott Hughes Cc: Android Kernel Team Signed-off-by: John Stultz --- fs/proc/base.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) -- 1.9.1 diff --git a/fs/proc/base.c b/fs/proc/base.c index 02f8389..01c3c2d 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -2281,15 +2281,17 @@ static ssize_t timerslack_ns_write(struct file *file, const char __user *buf, if (!p) return -ESRCH; - if (!capable(CAP_SYS_NICE)) { - count = -EPERM; - goto out; - } + if (p != current) { + if (!capable(CAP_SYS_NICE)) { + count = -EPERM; + goto out; + } - err = security_task_setscheduler(p); - if (err) { - count = err; - goto out; + err = security_task_setscheduler(p); + if (err) { + count = err; + goto out; + } } task_lock(p); @@ -2315,14 +2317,16 @@ static int timerslack_ns_show(struct seq_file *m, void *v) if (!p) return -ESRCH; - if (!capable(CAP_SYS_NICE)) { - err = -EPERM; - goto out; - } + if (p != current) { - err = security_task_getscheduler(p); - if (err) - goto out; + if (!capable(CAP_SYS_NICE)) { + err = -EPERM; + goto out; + } + err = security_task_getscheduler(p); + if (err) + goto out; + } task_lock(p); seq_printf(m, "%llu\n", p->timer_slack_ns);