Received: by 2002:a25:86ce:0:0:0:0:0 with SMTP id y14csp1112034ybm; Wed, 22 May 2019 17:45:01 -0700 (PDT) X-Google-Smtp-Source: APXvYqylx2+2v2IMaW32z4S3aouSOxm74TD/U0dHAbD2Kz9pUyod+03SGs9djk1rt9WO82JrqOxE X-Received: by 2002:a17:902:7617:: with SMTP id k23mr50398157pll.175.1558572301170; Wed, 22 May 2019 17:45:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558572301; cv=none; d=google.com; s=arc-20160816; b=P1Zk604IvJVG+63pO8Ik7oXreyVsn9V9M5RgRR34jBa2SDGTYKW7gnUGt1k0P6DD84 b58bAUO/HTMWvUuqiBkod6HFshiMC4V7cQ9ASh14qic9wwgVDq8zPqjwuX2HKqp78WKL fHneA9XRMZr42HJUKr1VYopGoUjxaSf32ujjO096P7QsF8nvB3QSIJtiNB8lWa/Ygu9O mNsrGjRZ95v/tUytC9yu1HMQI1BwhWnXCxe90dAzIxv2xZz8TC6dzIlPrGJ3ZaVmjm+T YsG2qEQR/GEWF9uU5s2bTtPk5M5Fvajimxh6SSDcxv8Zf9NaH1773CP03NyPt+ycxbX5 Z/0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:subject:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:cc:to:from; bh=eGt+iaxjII+w4qphTpsn4TLAGo0sdUvXKRyCLbvEvDY=; b=qj4KNfdJcyvyfQB3RR8KjdcGITSYi4rtP+XZ20d6C2PMbUVOHsgWQ2QqWf907uRsil 0vpQdPqHs8A/ROf7Mo1S4mgpnHGG48Fxz5MA+xVRP/6rYqG8ZxzDx5hrLwhXzhpCm2+6 oD/mubYi9/zn6/OeP5kG/SjisNIkI1QDujJ7qbbBkc0PNRYXbiqVNJcFGueeA0Rzan9U 3vCwfJxP5qZjtd0W+cNv2cf4TOO2E3gH39RnFYhmeD9Liq0h0XJXlfh1+pqzJAAYKLCi JTnqaPgH87kM2fZI62bL9YDGpQGnAty/VWBe3mcQ2S2KhdOt24RU02HjAP++GLGlj/no 2CEQ== ARC-Authentication-Results: i=1; mx.google.com; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=xmission.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v19si8993701plo.413.2019.05.22.17.44.45; Wed, 22 May 2019 17:45:01 -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; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=xmission.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730081AbfEWAnW (ORCPT + 99 others); Wed, 22 May 2019 20:43:22 -0400 Received: from out02.mta.xmission.com ([166.70.13.232]:57531 "EHLO out02.mta.xmission.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729675AbfEWAnN (ORCPT ); Wed, 22 May 2019 20:43:13 -0400 Received: from in01.mta.xmission.com ([166.70.13.51]) by out02.mta.xmission.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.87) (envelope-from ) id 1hTbp8-0008Ry-Km; Wed, 22 May 2019 18:43:10 -0600 Received: from ip72-206-97-68.om.om.cox.net ([72.206.97.68] helo=x220.int.ebiederm.org) by in01.mta.xmission.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_CBC_SHA256:128) (Exim 4.87) (envelope-from ) id 1hTbnL-0005Z3-9t; Wed, 22 May 2019 18:41:20 -0600 From: "Eric W. Biederman" To: linux-kernel@vger.kernel.org Cc: "Eric W. Biederman" , Linux Containers , Oleg Nesterov , linux-arch@vger.kernel.org Date: Wed, 22 May 2019 19:39:02 -0500 Message-Id: <20190523003916.20726-13-ebiederm@xmission.com> X-Mailer: git-send-email 2.21.0.dirty In-Reply-To: <20190523003916.20726-1-ebiederm@xmission.com> References: <20190523003916.20726-1-ebiederm@xmission.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-XM-SPF: eid=1hTbnL-0005Z3-9t;;;mid=<20190523003916.20726-13-ebiederm@xmission.com>;;;hst=in01.mta.xmission.com;;;ip=72.206.97.68;;;frm=ebiederm@xmission.com;;;spf=neutral X-XM-AID: U2FsdGVkX18NF+NSl/MsPbgYEADSVfa30hNfSipaa4g= X-SA-Exim-Connect-IP: 72.206.97.68 X-SA-Exim-Mail-From: ebiederm@xmission.com X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on sa06.xmission.com X-Spam-Level: **** X-Spam-Status: No, score=4.5 required=8.0 tests=ALL_TRUSTED,BAYES_50, DCC_CHECK_NEGATIVE,TR_Symld_Words,T_TooManySym_01,XMNoVowels,XMSubLong, XM_H_QuotedFrom autolearn=disabled version=3.4.2 X-Spam-Report: * -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP * 0.8 BAYES_50 BODY: Bayes spam probability is 40 to 60% * [score: 0.4999] * 1.5 TR_Symld_Words too many words that have symbols inside * 1.5 XMNoVowels Alpha-numberic number with no vowels * 0.7 XMSubLong Long Subject * 1.0 XM_H_QuotedFrom Sender address is in double quotes * -0.0 DCC_CHECK_NEGATIVE Not listed in DCC * [sa06 1397; Body=1 Fuz1=1 Fuz2=1] * 0.0 T_TooManySym_01 4+ unique symbols in subject X-Spam-DCC: XMission; sa06 1397; Body=1 Fuz1=1 Fuz2=1 X-Spam-Combo: ****;linux-kernel@vger.kernel.org X-Spam-Relay-Country: X-Spam-Timing: total 1291 ms - load_scoreonly_sql: 0.05 (0.0%), signal_user_changed: 2.9 (0.2%), b_tie_ro: 2.0 (0.2%), parse: 0.80 (0.1%), extract_message_metadata: 10 (0.8%), get_uri_detail_list: 0.95 (0.1%), tests_pri_-1000: 12 (0.9%), tests_pri_-950: 1.47 (0.1%), tests_pri_-900: 1.16 (0.1%), tests_pri_-90: 20 (1.5%), check_bayes: 18 (1.4%), b_tokenize: 5 (0.4%), b_tok_get_all: 4.8 (0.4%), b_comp_prob: 1.84 (0.1%), b_tok_touch_all: 2.6 (0.2%), b_finish: 0.64 (0.0%), tests_pri_0: 1229 (95.2%), check_dkim_signature: 0.50 (0.0%), check_dkim_adsp: 2.8 (0.2%), poll_dns_idle: 1.01 (0.1%), tests_pri_10: 2.4 (0.2%), tests_pri_500: 8 (0.6%), rewrite_mail: 0.00 (0.0%) Subject: [REVIEW][PATCH 12/26] signal/um: Remove task parameter from send_sigtrap X-Spam-Flag: No X-SA-Exim-Version: 4.2.1 (built Thu, 05 May 2016 13:38:54 -0600) X-SA-Exim-Scanned: Yes (on in01.mta.xmission.com) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The send_sigtrap function is always called with task == current. Make that explicit by removing the task parameter. This also makes it clear that the uml send_sigtrap passes current into force_sig_fault. Signed-off-by: "Eric W. Biederman" --- arch/um/kernel/ptrace.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/um/kernel/ptrace.c b/arch/um/kernel/ptrace.c index 5f47422401e1..1797dfe9ce6d 100644 --- a/arch/um/kernel/ptrace.c +++ b/arch/um/kernel/ptrace.c @@ -112,13 +112,13 @@ long arch_ptrace(struct task_struct *child, long request, return ret; } -static void send_sigtrap(struct task_struct *tsk, struct uml_pt_regs *regs, - int error_code) +static void send_sigtrap(struct uml_pt_regs *regs, int error_code) { /* Send us the fake SIGTRAP */ force_sig_fault(SIGTRAP, TRAP_BRKPT, /* User-mode eip? */ - UPT_IS_USER(regs) ? (void __user *) UPT_IP(regs) : NULL, tsk); + UPT_IS_USER(regs) ? (void __user *) UPT_IP(regs) : NULL, + current); } /* @@ -147,7 +147,7 @@ void syscall_trace_leave(struct pt_regs *regs) /* Fake a debug trap */ if (ptraced & PT_DTRACE) - send_sigtrap(current, ®s->regs, 0); + send_sigtrap(®s->regs, 0); if (!test_thread_flag(TIF_SYSCALL_TRACE)) return; -- 2.21.0