From patchwork Mon Dec 16 15:29:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Schwab X-Patchwork-Id: 103188 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D9F433858406 for ; Mon, 16 Dec 2024 15:30:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D9F433858406 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=mka3oxgz; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=d6l7rvMU; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=mka3oxgz; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=d6l7rvMU X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2a07:de40:b251:101:10:150:64:1]) by sourceware.org (Postfix) with ESMTPS id CDB003858D26 for ; Mon, 16 Dec 2024 15:29:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CDB003858D26 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org CDB003858D26 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:1 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1734362977; cv=none; b=fVOjAx33LCQ7uMUv6MZiG1AV7k11XwvHPExMZCIuoQhzNsDaadCeMWNlpU6QZr74tSI3HuOuJ2xOQw83140j8woX32N3sv0KDozegj6aVZEybcF7unPdd1judpf1ZY3KWjwH2/mVxOIv7lzyUtu2651YZXoqedh8wW3BGqOpiVg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1734362977; c=relaxed/simple; bh=YrOmSRsBgbWOgvfCeVmlhTjuL2U4gR1xPqkbKEZKykQ=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=B4Hk3+w+qzpH1SLjTZKnv6n9YA8nnCnwxY3AEucZJyAs+TgYq2uOqHFK7loq71f2O+j3Gj89RDyVeiuZ4euS/5E+8BHN5kf6X02ol7SkC7RJf4/uw87rMSB7L+J/fMFC4K/dzbh3JaAe2DLZaeDdmP+WOSaHOCvAkJaXmsutmW0= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CDB003858D26 Received: from hawking.nue2.suse.org (unknown [IPv6:2a07:de40:a101:3:92b1:1cff:fe69:ddc]) by smtp-out1.suse.de (Postfix) with ESMTP id BC1FB21137 for ; Mon, 16 Dec 2024 15:29:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1734362976; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=PbwKDb/+GIn90IYjWwhRjKZ2cTiXp8lZi7qHyY8Eyw0=; b=mka3oxgz3fvzF+sOK+8dHj8rqBNVXtZiDBiZtSSkpa3YTo3joUci40TJQZnjt+cIl/ze4x /bwoMozI2gUWQyhH8TZ1Y/uKKSvVj9/FnW9nAs5elhddgT67IXUwC83d/VPg8oUaSGDl/b /iqNKWjwbwmLJuhWScNQD5/snFkw29M= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1734362976; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=PbwKDb/+GIn90IYjWwhRjKZ2cTiXp8lZi7qHyY8Eyw0=; b=d6l7rvMUUMtQNw4S9hRLsDLGxRjSEO+LCo8sE9LNKJgWkwm7pVVfcQVyspY8EhZCZzGlBu IrbreMd4KnqOCzDQ== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=mka3oxgz; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=d6l7rvMU DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1734362976; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=PbwKDb/+GIn90IYjWwhRjKZ2cTiXp8lZi7qHyY8Eyw0=; b=mka3oxgz3fvzF+sOK+8dHj8rqBNVXtZiDBiZtSSkpa3YTo3joUci40TJQZnjt+cIl/ze4x /bwoMozI2gUWQyhH8TZ1Y/uKKSvVj9/FnW9nAs5elhddgT67IXUwC83d/VPg8oUaSGDl/b /iqNKWjwbwmLJuhWScNQD5/snFkw29M= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1734362976; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=PbwKDb/+GIn90IYjWwhRjKZ2cTiXp8lZi7qHyY8Eyw0=; b=d6l7rvMUUMtQNw4S9hRLsDLGxRjSEO+LCo8sE9LNKJgWkwm7pVVfcQVyspY8EhZCZzGlBu IrbreMd4KnqOCzDQ== Received: by hawking.nue2.suse.org (Postfix, from userid 17005) id A98BA4A0568; Mon, 16 Dec 2024 16:29:36 +0100 (CET) From: Andreas Schwab To: libc-alpha@sourceware.org Subject: [PATCH] Fix use of uninitialized variable during gai.conf parsing (bug 32465) Date: Mon, 16 Dec 2024 16:29:36 +0100 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-Spamd-Result: default: False [2.71 / 50.00]; BAYES_HAM(-2.99)[99.94%]; HFILTER_HOSTNAME_UNKNOWN(2.50)[]; RDNS_NONE(2.00)[]; ONCE_RECEIVED(1.20)[]; HFILTER_HELO_IP_A(1.00)[hawking.nue2.suse.org]; NEURAL_HAM_LONG(-1.00)[-1.000]; HFILTER_HELO_NORES_A_OR_MX(0.30)[hawking.nue2.suse.org]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCVD_NO_TLS_LAST(0.10)[]; MIME_GOOD(-0.10)[text/plain]; NEURAL_HAM_SHORT(-0.10)[-0.478]; MX_GOOD(-0.01)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DIRECT_TO_MX(0.00)[Gnus/5.13 (Gnus v5.13)]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; DKIM_TRACE(0.00)[suse.de:+]; MIME_TRACE(0.00)[0:+]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_COUNT_ONE(0.00)[1]; MID_RHS_MATCH_FROM(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim,suse.de:mid,suse.de:email] X-Spam-Score: 2.71 X-Rspamd-Queue-Id: BC1FB21137 X-Rspamd-Action: no action X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spamd-Bar: ++ X-Spam-Status: No, score=-9.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_PASS, 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 X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org Only check the endp variable if strtoul has actually been called to set it. --- nss/getaddrinfo.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/nss/getaddrinfo.c b/nss/getaddrinfo.c index a9fd589ac4..03db019080 100644 --- a/nss/getaddrinfo.c +++ b/nss/getaddrinfo.c @@ -1911,9 +1911,9 @@ add_prefixlist (struct prefixlist **listp, size_t *lenp, bool *nullbitsp, *pos = cp; if (inet_pton (AF_INET6, val1, &prefix) && (cp == NULL - || (bits = strtoul (cp, &endp, 10)) != ULONG_MAX - || errno != ERANGE) - && *endp == '\0' + || (((bits = strtoul (cp, &endp, 10)) != ULONG_MAX + || errno != ERANGE) + && *endp == '\0')) && bits <= 128 && ((val = strtoul (val2, &endp, 10)) != ULONG_MAX || errno != ERANGE) @@ -2072,9 +2072,9 @@ gaiconf_init (void) bits = 128; if (IN6_IS_ADDR_V4MAPPED (&prefix) && (cp == NULL - || (bits = strtoul (cp, &endp, 10)) != ULONG_MAX - || errno != ERANGE) - && *endp == '\0' + || (((bits = strtoul (cp, &endp, 10)) != ULONG_MAX + || errno != ERANGE) + && *endp == '\0')) && bits >= 96 && bits <= 128 && ((val = strtoul (val2, &endp, 10)) != ULONG_MAX @@ -2094,9 +2094,9 @@ gaiconf_init (void) } else if (inet_pton (AF_INET, val1, &prefix.s6_addr32[3]) && (cp == NULL - || (bits = strtoul (cp, &endp, 10)) != ULONG_MAX - || errno != ERANGE) - && *endp == '\0' + || (((bits = strtoul (cp, &endp, 10)) != ULONG_MAX + || errno != ERANGE) + && *endp == '\0')) && bits <= 32 && ((val = strtoul (val2, &endp, 10)) != ULONG_MAX || errno != ERANGE)