From patchwork Mon Feb 26 16:56:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleg Nesterov X-Patchwork-Id: 206805 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp2212946dyb; Mon, 26 Feb 2024 09:11:02 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXEx3GaMCZQjSzNEzYZB+rQkQnAbdryDZaDjYwX268hwlzhwk1ukToP0yWiuYA987KoEjsbVv6ktSp1mO+46niWO5oAVw== X-Google-Smtp-Source: AGHT+IGSG2ogeLqy6fBd2MS9GnM+lOgLwkDkvq609hmRQ945DXlKCVPjdGXOYlog0P+WnR6B7GcE X-Received: by 2002:a05:6512:40e:b0:512:cebe:d035 with SMTP id u14-20020a056512040e00b00512cebed035mr4551125lfk.52.1708967462176; Mon, 26 Feb 2024 09:11:02 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708967462; cv=pass; d=google.com; s=arc-20160816; b=h0YnZgYHDgUm/HJ9mOuYsDDIUT60jRRi49VZfksD0AhxIVANTo28n8FlI5hKwAiUCk AnYeimKX6ry9Yi+wjKTy9kaz5AZA+TjGoIsOu0br7sEqI5uekhnG3c/kyMod3E6W/vvn 9iXk+DuHhvscMMbDQ8Ck5h+PQatIaRDnDKi6QSLnkswLfKb0Rra6Q/wbS6ew5HTVpzqh uiTn6A573uZj9N639xaxrIFzWXYrDmt/FQ2fE/nZoSYWZXuUt9Hek9/w3YtDs77k25QC LpjAU5WLaEeS47AW5dBsyqNatJVm2I6Q66JhL5p7PDdLjPRNQ7WrfA2WfPSR/LEpzoZX LeJA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=user-agent:in-reply-to:content-disposition:mime-version :list-unsubscribe:list-subscribe:list-id:precedence:message-id :subject:cc:to:from:date:dkim-signature; bh=sSoBVhFfYf93x8huXQpUdUaaiwpj6qVsl4+myZwSTiY=; fh=XYYaR4W4e5P6Am9UNO2Ld8ZOhmhTidS777C2awg0gPA=; b=utIpedpOKwfVOwg9yL3e1d3O3lX6vQ7wQPWWMN7FuCVgALwYAegmQc+3ZEArtwPP0/ jpMqtAJTUpbcuzzeyy22pwyORXLH99x7+uk5TPoffiHXxYG24wLG2duGFigI3tORrlez h2cbrjYOChB1cEdARFxyIzIUY3H0YzHHQhscBUPR0O6WbJIPHzSAiqDzaQU4bRPOTTju PTfZINg/PveH2DdJV8AcPoeleHjNCgv8/0e3dL8VaVhIcNueb6BeBpex8p4rJUYXeLRo 0TU1guPDy2B/WXd7r16y0yAKlNEXFVXFBRKrqR0yOuvsJLkPMI83iHEwOHSjzMOS4Twy JV3A==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PVsVMq1Y; arc=pass (i=1 spf=pass spfdomain=redhat.com dkim=pass dkdomain=redhat.com dmarc=pass fromdomain=redhat.com); spf=pass (google.com: domain of linux-kernel+bounces-82003-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-82003-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id t12-20020a508d4c000000b00565f579c7a0si993736edt.155.2024.02.26.09.11.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Feb 2024 09:11:02 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-82003-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PVsVMq1Y; arc=pass (i=1 spf=pass spfdomain=redhat.com dkim=pass dkdomain=redhat.com dmarc=pass fromdomain=redhat.com); spf=pass (google.com: domain of linux-kernel+bounces-82003-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-82003-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id C0DB31F2B49E for ; Mon, 26 Feb 2024 17:11:01 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1529A13B28D; Mon, 26 Feb 2024 16:58:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="PVsVMq1Y" Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E83F012C522 for ; Mon, 26 Feb 2024 16:58:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708966696; cv=none; b=JCCYjPjg8TVTsnanLbN/mTbju9CBCUg8m/I+8ikqCNEM2k+aZyak8LC3VODmvhfiG0/ea2N0D07ilQoDLBxMOKZEnNNLivIaW21tDkUxdYjl47phENRR1wKM4bi1AwwYFqiIZaB+USftyQvf0spFm8jYidQIAGH0mtyP4LqvJZk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708966696; c=relaxed/simple; bh=rjMSd3WxYvgOWTwaE5VTCXZ7wiN0ODta7cZDebmA1QU=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition:In-Reply-To; b=a+DzGcrw3UHMRKc0wk1+y7Vj5rw4Ig7kXBzBp8gbvFcfMWxZgkAyMxPKXYMxuuaTG2j6TcL7ZcCgjvOL/x8D9u2rAvyQeNxSEIM9UvuL+4KUufFR0QKahr1MGinFwWlLdUK6THv4TViZ7BmEFaUHR7ChxlqTVU8nZ7Gt+YRF9GA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=PVsVMq1Y; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708966693; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to; bh=sSoBVhFfYf93x8huXQpUdUaaiwpj6qVsl4+myZwSTiY=; b=PVsVMq1Yi+IkP/b0qAKUs8D+J687Rmk2uzfmVwmBs1VqgY9g5kiFQWw18eBNr9r0Iw77bJ CIKERANdX5To2ww7MbMtClHGTaxFm2AwXW519E40qeFXFlr/QEuyk/NUmSYRNrk2TZy3nj 7wdSiLj+qPko11cgNdVLg8i4KfD5uuI= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-85-oTxWOuPWMYaohzELKozaAg-1; Mon, 26 Feb 2024 11:58:09 -0500 X-MC-Unique: oTxWOuPWMYaohzELKozaAg-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 679BE1C04B54; Mon, 26 Feb 2024 16:58:09 +0000 (UTC) Received: from dhcp-27-174.brq.redhat.com (unknown [10.45.226.85]) by smtp.corp.redhat.com (Postfix) with SMTP id BB74EC01644; Mon, 26 Feb 2024 16:58:07 +0000 (UTC) Received: by dhcp-27-174.brq.redhat.com (nbSMTP-1.00) for uid 1000 oleg@redhat.com; Mon, 26 Feb 2024 17:56:50 +0100 (CET) Date: Mon, 26 Feb 2024 17:56:47 +0100 From: Oleg Nesterov To: Andrew Morton Cc: "Eric W. Biederman" , Christian Brauner , Peter Collingbourne , Wen Yang , linux-kernel@vger.kernel.org Subject: [PATCH 1/3] get_signal: don't abuse ksig->info.si_signo and ksig->sig Message-ID: <20240226165647.GA20826@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20240226165612.GA20787@redhat.com> User-Agent: Mutt/1.5.24 (2015-08-30) X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791982265473456825 X-GMAIL-MSGID: 1791982265473456825 Cleanup and preparation for the next changes. get_signal() uses signr or ksig->info.si_signo or ksig->sig in a chaotic way, this looks confusing. Change it to always use signr. Signed-off-by: Oleg Nesterov --- kernel/signal.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/signal.c b/kernel/signal.c index c9c57d053ce4..09a6dd07cf6b 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -2842,7 +2842,7 @@ bool get_signal(struct ksignal *ksig) spin_lock_irq(&sighand->siglock); } - if (likely(do_signal_stop(ksig->info.si_signo))) { + if (likely(do_signal_stop(signr))) { /* It released the siglock. */ goto relock; } @@ -2866,7 +2866,7 @@ bool get_signal(struct ksignal *ksig) if (sig_kernel_coredump(signr)) { if (print_fatal_signals) - print_fatal_signal(ksig->info.si_signo); + print_fatal_signal(signr); proc_coredump_connector(current); /* * If it was able to dump core, this kills all @@ -2890,7 +2890,7 @@ bool get_signal(struct ksignal *ksig) /* * Death signals, no core dump. */ - do_group_exit(ksig->info.si_signo); + do_group_exit(signr); /* NOTREACHED */ } spin_unlock_irq(&sighand->siglock); @@ -2900,7 +2900,7 @@ bool get_signal(struct ksignal *ksig) if (!(ksig->ka.sa.sa_flags & SA_EXPOSE_TAGBITS)) hide_si_addr_tag_bits(ksig); - return ksig->sig > 0; + return signr > 0; } /**