Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp224085iob; Mon, 2 May 2022 17:43:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwANLICnB7nXjIaRU5fuIZwCZ0mGG+D1NpBET8972xwwKbQtluKL9QEp9jRTtZeP7hXS6Rg X-Received: by 2002:a17:90a:fd10:b0:1d9:2a41:6fe6 with SMTP id cv16-20020a17090afd1000b001d92a416fe6mr2006687pjb.196.1651538636997; Mon, 02 May 2022 17:43:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651538636; cv=none; d=google.com; s=arc-20160816; b=AFrcvn9Cz0/sMyed3+jwCRvXv38a+lzWrIYezfonZb3EnVjhRQvnv0vXTLBkZmZS26 zZVr7iQrj2qLxGNHRtSiMUknCGP5E02DicoIg/1ES+6G+tDssP7lxy0vayjVNJw35K4A PC4XsvKCbG5toO10EsqW1WLF8NqEcoDhy4yerNjDr/Msu7kKQgX8oF6ogxJGlCpTQxec a426rIu/Gz5MdOFTdvJ/8pRlB9Vp5kKuw7eXBDD4Wb+1ZaVc9ho0c0NKL9GyIE67I4a6 Z1sY8bg6rFzRHwci6/GlgyURHau5wPY9CZufxNETyU34aEo+RmPTFtHV9WvnG/c3x2gA HWPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:cc:to:from; bh=iXNjZtfBWrd1CwSflzbt8NQYg29uH1X6+4n6lLo0itA=; b=fGsNdSF+Jn6UBmd3UK30U27oV0TbjK+Lijsfn6YY9QE1zurJSSm/4L2wQUv41EqJDW V4mowokNR11ruRAqXw7KtOV/mZUd3c0Z+n2fohrLYf6Es+QybDhPXFdKJBZv1ivMIh/Y jMDdd7JK6AHOERMcs3It5tgQzzcgnz9M02A45DEAPTXlyP4LnfUTy9OpPVY1SxBos0nS Abcy0OLsDT3d2AaOTkhxVsWLQR6UILHOp+tk+kH28VOdQcjmszot7i51AhTjStZ+txlz rfWjXoOx2E0BcWpmjr42z9rBZ9Vxt92Uv/Xvrn0bIU86331kGUF/cUnREEgSfOeSzmi7 ZfxA== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 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 lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id t12-20020a654b8c000000b003c144fa99d2si15807956pgq.635.2022.05.02.17.43.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 May 2022 17:43:56 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=xmission.com Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id C10FE3B296; Mon, 2 May 2022 17:33:44 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245421AbiD2Vwq (ORCPT + 99 others); Fri, 29 Apr 2022 17:52:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47550 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239590AbiD2Vwd (ORCPT ); Fri, 29 Apr 2022 17:52:33 -0400 Received: from out01.mta.xmission.com (out01.mta.xmission.com [166.70.13.231]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C817DB4B6; Fri, 29 Apr 2022 14:49:14 -0700 (PDT) Received: from in02.mta.xmission.com ([166.70.13.52]:49872) by out01.mta.xmission.com with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1nkYUD-007OE5-Gn; Fri, 29 Apr 2022 15:49:13 -0600 Received: from ip68-227-174-4.om.om.cox.net ([68.227.174.4]:36464 helo=localhost.localdomain) by in02.mta.xmission.com with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1nkYUC-007RIp-Gl; Fri, 29 Apr 2022 15:49:13 -0600 From: "Eric W. Biederman" To: linux-kernel@vger.kernel.org Cc: rjw@rjwysocki.net, Oleg Nesterov , mingo@kernel.org, vincent.guittot@linaro.org, dietmar.eggemann@arm.com, rostedt@goodmis.org, mgorman@suse.de, bigeasy@linutronix.de, Will Deacon , tj@kernel.org, linux-pm@vger.kernel.org, Peter Zijlstra , Richard Weinberger , Anton Ivanov , Johannes Berg , linux-um@lists.infradead.org, Chris Zankel , Max Filippov , linux-xtensa@linux-xtensa.org, Kees Cook , Jann Horn , linux-ia64@vger.kernel.org, "Eric W. Biederman" , stable@vger.kernel.org, Al Viro Date: Fri, 29 Apr 2022 16:48:31 -0500 Message-Id: <20220429214837.386518-6-ebiederm@xmission.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <87k0b7v9yk.fsf_-_@email.froward.int.ebiederm.org> References: <87k0b7v9yk.fsf_-_@email.froward.int.ebiederm.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-XM-SPF: eid=1nkYUC-007RIp-Gl;;;mid=<20220429214837.386518-6-ebiederm@xmission.com>;;;hst=in02.mta.xmission.com;;;ip=68.227.174.4;;;frm=ebiederm@xmission.com;;;spf=softfail X-XM-AID: U2FsdGVkX1+vbrOvInw4J3zemlYv0MOslvPzk7U8i+A= X-SA-Exim-Connect-IP: 68.227.174.4 X-SA-Exim-Mail-From: ebiederm@xmission.com X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RDNS_NONE, SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 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 359 ms - load_scoreonly_sql: 0.05 (0.0%), signal_user_changed: 11 (3.0%), b_tie_ro: 9 (2.6%), parse: 0.98 (0.3%), extract_message_metadata: 15 (4.2%), get_uri_detail_list: 1.03 (0.3%), tests_pri_-1000: 20 (5.7%), tests_pri_-950: 1.34 (0.4%), tests_pri_-900: 1.16 (0.3%), tests_pri_-90: 90 (25.1%), check_bayes: 88 (24.4%), b_tokenize: 7 (2.0%), b_tok_get_all: 7 (1.9%), b_comp_prob: 2.3 (0.6%), b_tok_touch_all: 68 (18.9%), b_finish: 1.01 (0.3%), tests_pri_0: 207 (57.6%), check_dkim_signature: 0.68 (0.2%), check_dkim_adsp: 3.4 (1.0%), poll_dns_idle: 1.11 (0.3%), tests_pri_10: 2.3 (0.6%), tests_pri_500: 7 (2.0%), rewrite_mail: 0.00 (0.0%) Subject: [PATCH v2 06/12] ptrace: Reimplement PTRACE_KILL by always sending SIGKILL X-SA-Exim-Version: 4.2.1 (built Sat, 08 Feb 2020 21:53:50 +0000) X-SA-Exim-Scanned: Yes (on in02.mta.xmission.com) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Call send_sig_info in PTRACE_KILL instead of ptrace_resume. Calling ptrace_resume is not safe to call if the task has not been stopped with ptrace_freeze_traced. Cc: stable@vger.kernel.org Reported-by: Al Viro Suggested-by: Al Viro Signed-off-by: "Eric W. Biederman" --- kernel/ptrace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/ptrace.c b/kernel/ptrace.c index ccc4b465775b..43da5764b6f3 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c @@ -1238,7 +1238,7 @@ int ptrace_request(struct task_struct *child, long request, case PTRACE_KILL: if (child->exit_state) /* already dead */ return 0; - return ptrace_resume(child, request, SIGKILL); + return send_sig_info(SIGKILL, SEND_SIG_NOINFO, child); #ifdef CONFIG_HAVE_ARCH_TRACEHOOK case PTRACE_GETREGSET: -- 2.35.3