From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 496853858D32 for ; Mon, 8 Apr 2024 15:28:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 496853858D32 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 496853858D32 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712590101; cv=none; b=pT44ksgABq8P6PYZeVcUuzHoP0Vdqi8WDDHd8m9god1fqOsacu3m/4qCYYy1vq6Ov/YUtN3Yv4g6OON6plZbRHqz8DNoL35noR+1bVM9h84x6O03vY9bWauBdg6zkXOrTYIUSkhsVH4/rYeHbHxI+Y8n1+YueiLn76wvaBZICEc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712590101; c=relaxed/simple; bh=+5HNLW2KDcjIzKcyl2wf7lkFrLl6I0b3+cBo/iNsI+g=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=fvNhczSBIDGgDRRvYNN1RqZ+WZ2VTT2ipQxPsjLbiuA83JIydBxkv1klxG2cUyYtCbCsbz6nKf28pMr+n2WkdKjxrd5i1OfOj8tQvEtPr7nZdXydcy/tMiw6iHO2T18ZsqTcRKx05w21po3clYvzuoN2ciJmCqrOiPCd1z3+u4Q= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712590098; 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:references:references; bh=QuSfBW/Jir39Ipk6uTmgJvanwgiyOmKmp0MXX2JgdmQ=; b=OdSw6kwJ0z6c4JGfs8ACzLcYyDNDHQeQvSekfeO3PDNluY9tTYFvysplgCoGqwmabwucr3 NR0r4uz+qn1RsWK3u/VeHBYlcbuD9qrWJ2EYkxSVjkpApiBvM+kA63C0XqPid8mbSs7/n9 M6ZtBXiUAUjGXDgwbtLVK6iv1P+3N9I= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-222-w7OSuoT8NdSycqRHFxV5lQ-1; Mon, 08 Apr 2024 11:28:17 -0400 X-MC-Unique: w7OSuoT8NdSycqRHFxV5lQ-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 34DD210499A7; Mon, 8 Apr 2024 15:28:17 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.39.192.59]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9DB25C0157E; Mon, 8 Apr 2024 15:28:16 +0000 (UTC) From: Florian Weimer To: "H.J. Lu" Cc: libc-alpha@sourceware.org Subject: Re: [PATCH] elf: Don't call fatal_error in _dl_signal_error In-Reply-To: <20240403123928.165033-1-hjl.tools@gmail.com> (H. J. Lu's message of "Wed, 3 Apr 2024 05:39:28 -0700") References: <20240403123928.165033-1-hjl.tools@gmail.com> Date: Mon, 08 Apr 2024 17:28:10 +0200 Message-ID: <87ttkbvppx.fsf@oldenburg.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: * H. J. Lu: > Don't call fatal_error in _dl_signal_error since _dl_signal_error should > only be called from _dl_catch_exception and get_catch should never return > NULL. Otherwise, fatal_error should be called directly instead. > --- > elf/dl-catch.c | 13 ++++--------- > 1 file changed, 4 insertions(+), 9 deletions(-) > > diff --git a/elf/dl-catch.c b/elf/dl-catch.c > index 2109516dba..a023555165 100644 > --- a/elf/dl-catch.c > +++ b/elf/dl-catch.c > @@ -117,16 +117,11 @@ _dl_signal_error (int errcode, const char *objname, const char *occasion, > if (! errstring) > errstring = N_("DYNAMIC LINKER BUG!!!"); > > - if (lcatch != NULL) > - { > - _dl_exception_create (lcatch->exception, objname, errstring); > - *lcatch->errcode = errcode; > + _dl_exception_create (lcatch->exception, objname, errstring); > + *lcatch->errcode = errcode; > > - /* We do not restore the signal mask because none was saved. */ > - __longjmp (lcatch->env[0].__jmpbuf, 1); > - } > - else > - fatal_error (errcode, objname, occasion, errstring); > + /* We do not restore the signal mask because none was saved. */ > + __longjmp (lcatch->env[0].__jmpbuf, 1); > } > rtld_hidden_def (_dl_signal_error) elf/ld.so program-does-not-exist triggers are null pointer dereference with this patch. I'll post a proper test case for this, looks like we have a gap here. Thanks, Florian