From patchwork Sun Mar 6 10:39:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allan McRae X-Patchwork-Id: 2042 Return-Path: Delivered-To: patchwork@archlinux.org Received: from mail.archlinux.org [95.216.189.61] by patchwork.archlinux.org with IMAP (fetchmail-6.4.27) for (single-drop); Sun, 06 Mar 2022 10:39:33 +0000 (UTC) Received: from mail.archlinux.org by mail.archlinux.org with LMTP id uRSVHGSPJGKRNwUAK+/4rw (envelope-from ) for ; Sun, 06 Mar 2022 10:39:32 +0000 Received: from lists.archlinux.org (lists.archlinux.org [95.217.236.249]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.archlinux.org (Postfix) with ESMTPS id 90077DABE8C; Sun, 6 Mar 2022 10:39:31 +0000 (UTC) Received: from lists.archlinux.org (localhost [IPv6:::1]) by lists.archlinux.org (Postfix) with ESMTP id 6AAB7DA659A; Sun, 6 Mar 2022 10:39:31 +0000 (UTC) X-Original-To: pacman-dev@lists.archlinux.org Delivered-To: pacman-dev@lists.archlinux.org Received: from mail.archlinux.org (mail.archlinux.org [95.216.189.61]) by lists.archlinux.org (Postfix) with ESMTPS id 1E487DA6583 for ; Sun, 6 Mar 2022 10:39:29 +0000 (UTC) From: Allan McRae DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=archlinux.org; s=dkim-rsa; t=1646563168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=zAUvTjdvlQThPHD5UICm9ysW3o1RLEgjfzeEEs1GEVA=; b=hUQBl+qKotofKeoNobYForkWAvtHRyyhf1mIG6YviZEBL+HY5TiFSpktc2gOXTf3TrqrFq tIyo+ozv2OrcadhUzFzIrFKrtGH8bp0Sm+QmXWvCFFSM5rMr7ijsEpB4+Ux0u2pFLz3S/7 FarGZJ6GOP3vIC5AqXvUMsohLeGb9S03/ccmQ8ojpf+Rw5KbIwsnKQyzsCdH8HE3VLJCWZ eZFC9rInSKz2w4j5/SXrVYWpdh/9ffp5fMIeCzf8dbBqBGtwiJgpDGWCn0gmMBCoKvZTOR MjtvHtqFakhSTKAPX6UemNmPi2pEkJQmpNkN4pwKl8Nvjt7J+PNeRCN1U9dYFjWYQdV/rN pYYYXQnKTZZkyRwc3txnIThLgHinK774t3PMWb4cvZXeeEfvAy5F+ot/DNMF8RNxcSPP0O wMIU9TG6u1a8grqQaX9X+PNFEJkpZdIXS6ckeWobDomtwYIafXfGjwvmLk+N9qzRGRYkqu K5ryrflG55Q4qhE6I09rjl8j7wS0wrjVkc6WJ+mSIloomhYa20/pdtzutiqcNiuWu5fhWL 2SJUE62xjCUrfDvLDxWzG5ChZQ5ZX1AZMbZhKg7DsaNI9+xJ30w9aqhbh5zrBChmbaeNVo go/+S9Tc2EtgTTGXgsNQHrjzAoOUmtPeaB4z29OJExTFt7unx7DXo= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=archlinux.org; s=dkim-ed25519; t=1646563168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=zAUvTjdvlQThPHD5UICm9ysW3o1RLEgjfzeEEs1GEVA=; b=UxKBUAdneXTIUnNltiB1Z898pT0Z2Y9nkp0vAarmIZt5L24gv6Dg4af0ZuQpCwMkP3Weu8 0h7dxFrSQIX96VAw== To: pacman-dev@lists.archlinux.org Subject: [PATCH] Fix segfault when failing to import keys Date: Sun, 6 Mar 2022 20:39:17 +1000 Message-Id: <20220306103917.2251675-1-allan@archlinux.org> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-BeenThere: pacman-dev@lists.archlinux.org X-Mailman-Version: 2.1.39 Precedence: list List-Id: Discussion list for pacman development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: pacman-dev-bounces@lists.archlinux.org Sender: "pacman-dev" X-Rspamd-Queue-Id: 90077DABE8C Authentication-Results: mail.archlinux.org; dkim=pass header.d=archlinux.org header.s=dkim-rsa header.b=hUQBl+qK; dkim=pass header.d=archlinux.org header.s=dkim-ed25519 header.b=UxKBUAdn; dmarc=pass (policy=none) header.from=archlinux.org; spf=pass (mail.archlinux.org: domain of pacman-dev-bounces@lists.archlinux.org designates 95.217.236.249 as permitted sender) smtp.mailfrom=pacman-dev-bounces@lists.archlinux.org X-Spamd-Result: default: False [-2.61 / 15.00]; DWL_DNSWL_MED(-2.00)[archlinux.org:dkim]; MID_CONTAINS_FROM(1.00)[]; RCVD_DKIM_ARC_DNSWL_MED(-0.50)[]; DMARC_POLICY_ALLOW(-0.50)[archlinux.org,none]; R_MISSING_CHARSET(0.50)[]; RCVD_IN_DNSWL_MED(-0.40)[95.217.236.249:from,95.216.189.61:received]; R_DKIM_ALLOW(-0.20)[archlinux.org:s=dkim-rsa,archlinux.org:s=dkim-ed25519]; MAILLIST(-0.20)[mailman]; R_SPF_ALLOW(-0.20)[+ip4:95.217.236.249:c]; MIME_GOOD(-0.10)[text/plain]; HAS_LIST_UNSUB(-0.01)[]; MIME_TRACE(0.00)[0:+]; NEURAL_HAM(-0.00)[-1.000]; ASN(0.00)[asn:24940, ipnet:95.217.0.0/16, country:DE]; RCVD_TLS_LAST(0.00)[]; ARC_NA(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; PREVIOUSLY_DELIVERED(0.00)[pacman-dev@lists.archlinux.org]; FROM_HAS_DN(0.00)[]; DKIM_TRACE(0.00)[archlinux.org:+]; TO_DN_NONE(0.00)[]; FROM_NEQ_ENVFROM(0.00)[allan@archlinux.org,pacman-dev-bounces@lists.archlinux.org]; RCPT_COUNT_ONE(0.00)[1]; FORGED_SENDER_MAILLIST(0.00)[] X-Rspamd-Server: mail.archlinux.org Avoid a segfault when a search of the keyserver returns that the key is found but returns no primary IDs. We are then likely going to fail the import, but attempt anyway because no-one know what a keyserver will do! Fixes FS#73534. Signed-off-by: Allan McRae --- lib/libalpm/signing.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index 0e022624..8a7fd87c 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -359,14 +359,18 @@ static int key_search_keyserver(alpm_handle_t *handle, const char *fpr, } else { pgpkey->fingerprint = key->subkeys->keyid; } - pgpkey->uid = key->uids->uid; - pgpkey->name = key->uids->name; - pgpkey->email = key->uids->email; + + /* we are probably going to fail importing, but continue anyway... */ + if(key->uids != NULL) { + pgpkey->uid = key->uids->uid; + pgpkey->name = key->uids->name; + pgpkey->email = key->uids->email; + } + pgpkey->created = key->subkeys->timestamp; pgpkey->expires = key->subkeys->expires; pgpkey->length = key->subkeys->length; pgpkey->revoked = key->subkeys->revoked; - /* Initialize with '?', this is overwritten unless public key * algorithm is unknown. */ pgpkey->pubkey_algo = '?'; @@ -535,7 +539,7 @@ int _alpm_key_import(alpm_handle_t *handle, const char *uid, const char *fpr) ret = 0; } else { _alpm_log(handle, ALPM_LOG_ERROR, - _("key \"%s\" could not be imported\n"), fetch_key.uid); + _("key \"%s\" could not be imported\n"), fpr); } } else { _alpm_log(handle, ALPM_LOG_ERROR,