Received: by 2002:a05:6a10:1a4d:0:0:0:0 with SMTP id nk13csp3500550pxb; Fri, 11 Feb 2022 00:53:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJz95aTwHYNLcloyJpMhkJWqS/mV0UQGiEJY9QlUolNrN4kMU4RAhx0XNRWnAnaCHYTC+fZA X-Received: by 2002:a17:907:2ce5:: with SMTP id hz5mr511513ejc.480.1644569615441; Fri, 11 Feb 2022 00:53:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644569615; cv=none; d=google.com; s=arc-20160816; b=A7leagynvY7l3hm4sJXVVOkDsmwWbeeS/YtAnH/ObQXRr8ZmdVdt8cAZfevbQEtxFs 7nqn1H/XAisUa+KnkuGO1xpRATBkhC3ozlSanuTCNkUTqnHSFetKhWUDLPecB6s0OdwE QB7VNLbjd9JhhZNAPlyLzqUi4Viz+/1ZXlw7FqbuXHn0XGoyTeqW3D/grQXgfYx3Axn5 MJZxfllTBvMgh/+O7cw4HzlDNas37bX1k6b03FmFyWp5rJx31NSfsspI6lt5fjAm2aXT SwO7QAf5O4+LjXTp6rgOcPuio2w3De9LvboN8WbPt1uTfcfX+8Y1oI+pmkqcciJNVTZ0 nMZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:mime-version:user-agent:message-id :in-reply-to:date:references:cc:to:from; bh=Uxe3Ivf+0SGLQtUiKZ7j+JjrUPYqJlLCFzihlNL8b8Y=; b=TO9c6/UXdgW5vPVhc0pPPZ0YLUeA0+THthedDJrprFnuc9qezTNGR7xM/2iYxNtI/A eGXooXxqMiRWHV5X2REVW/KdWiCa5pG49vJFSHpv86MZTOw5oqjBA3Uqi5BCamUfk+Pu zW/gYAf30+gZtpJ/scC9lJmA/rfK1ICaNDXFO0cCkaCXZuE/ydREIUouhtlqP4YOUWJy Z/5eZZzT57tN8hoUizwWHGB4HxnFG6KEITtbT+ULIYUlPtQMWmOb5qWnky3KyaluMEd+ W4R3kP/tV24SR1aS9bDJMRcEAUrd/+1FEwSgTd6hXN5D9UOail0p9sP2xOsWwsieBytP kS6A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id fy1si8116337ejc.779.2022.02.11.00.53.09; Fri, 11 Feb 2022 00:53:35 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 S1345234AbiBJWtN (ORCPT + 99 others); Thu, 10 Feb 2022 17:49:13 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:37522 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242109AbiBJWtM (ORCPT ); Thu, 10 Feb 2022 17:49:12 -0500 Received: from out01.mta.xmission.com (out01.mta.xmission.com [166.70.13.231]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 958C3B6F; Thu, 10 Feb 2022 14:49:09 -0800 (PST) Received: from in01.mta.xmission.com ([166.70.13.51]:53576) by out01.mta.xmission.com with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1nIIFQ-000DO7-EC; Thu, 10 Feb 2022 15:49:08 -0700 Received: from ip68-227-174-4.om.om.cox.net ([68.227.174.4]:47596 helo=email.froward.int.ebiederm.org.xmission.com) by in01.mta.xmission.com with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1nIIFO-00EgvJ-TW; Thu, 10 Feb 2022 15:49:07 -0700 From: "Eric W. Biederman" To: Kees Cook Cc: Robert =?utf-8?B?xZp3acSZY2tp?= , Andy Lutomirski , Will Drewry , linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org References: <20220210025321.787113-1-keescook@chromium.org> <871r0a8u29.fsf@email.froward.int.ebiederm.org> <202202101033.9C04563D9@keescook> <87pmnu5z28.fsf@email.froward.int.ebiederm.org> <202202101137.B48D02138@keescook> Date: Thu, 10 Feb 2022 16:48:30 -0600 In-Reply-To: <202202101137.B48D02138@keescook> (Kees Cook's message of "Thu, 10 Feb 2022 12:43:14 -0800") Message-ID: <87k0e249tt.fsf@email.froward.int.ebiederm.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-XM-SPF: eid=1nIIFO-00EgvJ-TW;;;mid=<87k0e249tt.fsf@email.froward.int.ebiederm.org>;;;hst=in01.mta.xmission.com;;;ip=68.227.174.4;;;frm=ebiederm@xmission.com;;;spf=neutral X-XM-AID: U2FsdGVkX1/JHZfXIjTQBa3uqb2Ausc9H2cCfR+/F2Q= 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=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-DCC: XMission; sa06 1397; Body=1 Fuz1=1 Fuz2=1 X-Spam-Combo: **;Kees Cook X-Spam-Relay-Country: X-Spam-Timing: total 656 ms - load_scoreonly_sql: 0.32 (0.0%), signal_user_changed: 11 (1.7%), b_tie_ro: 8 (1.3%), parse: 1.31 (0.2%), extract_message_metadata: 15 (2.3%), get_uri_detail_list: 4.1 (0.6%), tests_pri_-1000: 6 (0.9%), tests_pri_-950: 1.51 (0.2%), tests_pri_-900: 1.10 (0.2%), tests_pri_-90: 80 (12.1%), check_bayes: 78 (11.9%), b_tokenize: 14 (2.1%), b_tok_get_all: 11 (1.6%), b_comp_prob: 4.3 (0.6%), b_tok_touch_all: 46 (7.1%), b_finish: 0.70 (0.1%), tests_pri_0: 525 (80.0%), check_dkim_signature: 0.79 (0.1%), check_dkim_adsp: 2.6 (0.4%), poll_dns_idle: 0.69 (0.1%), tests_pri_10: 3.0 (0.5%), tests_pri_500: 8 (1.3%), rewrite_mail: 0.00 (0.0%) Subject: Re: [PATCH 0/3] signal: HANDLER_EXIT should clear SIGNAL_UNKILLABLE X-SA-Exim-Version: 4.2.1 (built Sat, 08 Feb 2020 21:53:50 +0000) X-SA-Exim-Scanned: Yes (on in01.mta.xmission.com) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Kees Cook writes: > On Thu, Feb 10, 2022 at 12:58:07PM -0600, Eric W. Biederman wrote: >> Kees Cook writes: >> >> > On Thu, Feb 10, 2022 at 12:17:50PM -0600, Eric W. Biederman wrote: >> >> Kees Cook writes: >> >> >> >> > Hi, >> >> > >> >> > This fixes the signal refactoring to actually kill unkillable processes >> >> > when receiving a fatal SIGSYS from seccomp. Thanks to Robert for the >> >> > report and Eric for the fix! I've also tweaked seccomp internal a bit to >> >> > fail more safely. This was a partial seccomp bypass, in the sense that >> >> > SECCOMP_RET_KILL_* didn't kill the process, but it didn't bypass other >> >> > aspects of the filters. (i.e. the syscall was still blocked, etc.) >> >> >> >> Any luck on figuring out how to suppress the extra event? >> > >> > I haven't found a good single indicator of a process being in an "I am dying" >> > state, and even if I did, it seems every architecture's exit path would >> > need to add a new test. >> >> The "I am dying" state for a task is fatal_signal_pending, at least >> before get_signal is reached, for a process there is SIGNAL_GROUP_EXIT. >> Something I am busily cleaning up and making more reliable at the >> moment. > > The state I need to catch is "I am dying and this syscall was > interrupted". fatal_signal_pending() is kind of only the first half > (though it doesn't cover fatal SIGSYS?) > > For example, if a process hits a BUG() in the middle of running a > syscall, that syscall isn't expected to "exit" from the perspective of > userspace. This is similarly true for seccomp's fatal SIGSYS. > >> What is the event that is happening? Is it >> tracehook_report_syscall_exit or something else? > > Yes, but in more completely, it's these three, which are called in > various fashions from architecture syscall exit code: > > audit_syscall_exit() (audit) > trace_sys_exit() (see "TRACE_EVENT_FN(sys_exit,") > tracehook_report_syscall_exit() (ptrace) > >> From the bits I have seen it seems like something else. > > But yes, the place Robert and I both noticed it was with ptrace from > tracehook_report_syscall_exit(), which is rather poorly named. :) Speaking of patches I am just about to send out. > Looking at the results, audit_syscall_exit() and trace_sys_exit() need > to be skipped too, since they would each be reporting potential nonsense. > >> > The best approach seems to be clearing the TIF_*WORK* bits, but that's >> > still a bit arch-specific. And I'm not sure which layer would do that. >> > At what point have we decided the process will not continue? More >> > than seccomp was calling do_exit() in the middle of a syscall, but those >> > appear to have all been either SIGKILL or SIGSEGV? >> >> This is where I get confused what TIF_WORK bits matter? > > This is where I wish all the architectures were using the common syscall > code. The old do_exit() path would completely skip _everything_ in the > exit path, so it was like never calling anything after the syscall > dispatch table. The only userspace visible things in there are triggered > from having TIF_WORK... flags (but again, it's kind of a per-arch mess). > > Skipping the entire exit path makes a fair bit of sense. For example, > rseq_syscall() is redundant (forcing SIGSEGV). > > Regardless, at least the three places above need to be skipped. > > But just testing fatal_signal_pending() seems wrong: a normal syscall > could be finishing just fine, it just happens to have a fatal signal > ready to be processed. Yes. It is really just the HANDLER_EXIT case where this is interesting. > > Here's the ordering after a syscall on x86 from do_syscall_64(): > > do_syscall_x64() > sys_call_table[...](regs) > syscall_exit_to_user_mode() > __syscall_exit_to_user_mode_work() > syscall_exit_to_user_mode_prepare() > syscall_exit_work() > arch_syscall_exit_tracehook() > tracehook_report_syscall_exit() > exit_to_user_mode_prepare() > exit_to_user_mode_loop() > handle_signal_work() > arch_do_signal_or_restart() > get_signal() > do_group_exit() > > Here's arm64 from el0_svc(): > > do_el0_svc() > el0_svc_common() > invoke_syscall() > syscall_table[...](regs) > syscall_trace_exit() > tracehook_report_syscall() > tracehook_report_syscall_exit() > exit_to_user_mode() > prepare_exit_to_user_mode() > do_notify_resume() > do_signal() > get_signal() > do_group_exit() > > In the past, any do_exit() would short circuit everything after the > syscall table. Now, we do all the exit work before starting the return > to user mode which is what processes the signals. So I guess there's > more precisely a difference between "visible to userspace" and "return > to userspace". Yes. I see that now. I had not had an occasion to look at the order all of these were called in before and my mental model was wrong. It makes a certain kind of sense that the per syscall work happens before we do additional things like process signals. It simply had not realized that was happening in that order until now. > (an aside: where to PF_IO_WORKER threads die?) They are calling do_exit explicitly. >> I expect if anything else mattered we would need to change it to >> HANDLER_EXIT. >> >> I made a mistake conflating to cases and I want to make certain I >> successfully separate those two cases at the end of the day. > > For skipping the exit work, I'm not sure it matters, since all the > signal stuff is "too late"... The conflation lead me to believe that we could simply and safely cause seccomp to use normal signal delivery to kill the process. The first part of the conflation I sorted out by introducing HANDLER_EXIT. The user visible part of the change I am not yet certain what to do with. My gut reaction is does it matter? Can you escape the seccomp filter with a stop? Does it break userspace? I realize the outcome of that question is that it does matter so we probably need to find a way to supress that situation for HANDLER_EXIT. Both force_exit_sig and force_sig_seccomp appear to be using dumpable signals which makes the problem doubly tricky. The first tricky bit is fatal_signal_pending isn't set because a coredump is possible, so something else is needed to detect this condition. The second part is what to do when we detect the condition. The only solution I can think of quickly is to modify force_sig_info_to_task clear TIF_SYSCALL_WORK on the architectures where that is used and to clear SYSCALL_WORK_EXIT on x86 and s390, and to do whatever the architecture appropriate thing is on the other architectures. It might be easier once I have cleaned some more code up but as long as we can limit the logic to force_sig_info_to_task for the HANDLER_EXIT case I don't see any advantage in the cleanups I have planned for this case. This may be incentive to make the architecture code more uniform in this area. Anyway I am off to finish fixing some other bugs. Eric