Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Leap:15.5:Update
glibc.33443
nss-files-hosts-v4mapped.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File nss-files-hosts-v4mapped.patch of Package glibc.33443
From 1b1e922657ea83bc40e63043eac13d0faf2b6c62 Mon Sep 17 00:00:00 2001 From: Andreas Schwab <schwab@suse.de> Date: Wed, 19 Jul 2023 09:55:31 +0200 Subject: [PATCH] Restore lookup of IPv4 mapped addresses in files database (bug 25457) This was broken by commit 9c02d0784d ("nss_files: Remove RES_USE_INET6 from hosts processing"), which removed too much. --- nss/Makefile | 1 + nss/nss_files/files-hosts.c | 23 +++++++---- nss/tst-nss-files-hosts-v4mapped.c | 41 +++++++++++++++++++ .../etc/hosts | 1 + .../etc/nsswitch.conf | 1 + 5 files changed, 59 insertions(+), 8 deletions(-) create mode 100644 nss/tst-nss-files-hosts-v4mapped.c create mode 100644 nss/tst-nss-files-hosts-v4mapped.root/etc/hosts create mode 100644 nss/tst-nss-files-hosts-v4mapped.root/etc/nsswitch.conf diff --git a/nss/Makefile b/nss/Makefile index 97bab5bb75..39febe8654 100644 --- a/nss/Makefile +++ b/nss/Makefile @@ -62,6 +62,7 @@ xtests = bug-erange tests-container = \ tst-nss-test3 \ tst-nss-files-hosts-long \ + tst-nss-files-hosts-v4mapped \ tst-nss-db-endpwent \ tst-nss-db-endgrent diff --git a/nss/nss_files/files-hosts.c b/nss/nss_files/files-hosts.c index 92c5d9728d..6cf7d7abc0 100644 --- a/nss/nss_files/files-hosts.c +++ b/nss/nss_files/files-hosts.c @@ -27,6 +27,7 @@ /* Get implementation for some internal functions. */ +#include "../resolv/mapv4v6addr.h" #include "../resolv/res_hconf.h" @@ -34,8 +35,8 @@ #define DATABASE "hosts" #define NEED_H_ERRNO -#define EXTRA_ARGS , af -#define EXTRA_ARGS_DECL , int af +#define EXTRA_ARGS , af, flags +#define EXTRA_ARGS_DECL , int af, int flags #define ENTDATA hostent_data struct hostent_data @@ -60,7 +61,12 @@ LINE_PARSER af = af == AF_UNSPEC ? AF_INET : af; else { - if (af == AF_INET && inet_pton (AF_INET6, addr, entdata->host_addr) > 0) + if (af == AF_INET6 && (flags & AI_V4MAPPED) != 0 + && inet_pton (AF_INET, addr, entdata->host_addr) > 0) + map_v4v6_address ((char *) entdata->host_addr, + (char *) entdata->host_addr); + else if (af == AF_INET + && inet_pton (AF_INET6, addr, entdata->host_addr) > 0) { if (IN6_IS_ADDR_V4MAPPED (entdata->host_addr)) memcpy (entdata->host_addr, entdata->host_addr + 12, INADDRSZ); @@ -93,13 +99,14 @@ LINE_PARSER STRING_FIELD (result->h_name, isspace, 1); }) -#define EXTRA_ARGS_VALUE , AF_INET +#define EXTRA_ARGS_VALUE , AF_INET, 0 #include "files-XXX.c" #undef EXTRA_ARGS_VALUE /* We only need to consider IPv4 mapped addresses if the input to the gethostbyaddr() function is an IPv6 address. */ -#define EXTRA_ARGS_VALUE , af +#define EXTRA_ARGS_VALUE \ + , af, (len == IN6ADDRSZ ? AI_V4MAPPED : 0) DB_LOOKUP (hostbyaddr, ,,, { if (result->h_length == (int) len @@ -151,7 +158,7 @@ gethostbyname3_multi (FILE * stream, const char *name, int af, while (true) { status = internal_getent (stream, &tmp_result_buf, tmp_buffer.data, - tmp_buffer.length, errnop, herrnop, af); + tmp_buffer.length, errnop, herrnop, af, 0); /* Enlarge the buffer if necessary. */ if (status == NSS_STATUS_TRYAGAIN && *herrnop == NETDB_INTERNAL && *errnop == ERANGE) @@ -336,7 +343,7 @@ _nss_files_gethostbyname3_r (const char *name, int af, struct hostent *result, if (status == NSS_STATUS_SUCCESS) { while ((status = internal_getent (stream, result, buffer, buflen, errnop, - herrnop, af)) + herrnop, af, 0)) == NSS_STATUS_SUCCESS) { LOOKUP_NAME_CASE (h_name, h_aliases) @@ -398,7 +405,7 @@ _nss_files_gethostbyname4_r (const char *name, struct gaih_addrtuple **pat, struct hostent result; status = internal_getent (stream, &result, buffer, buflen, errnop, - herrnop, AF_UNSPEC); + herrnop, AF_UNSPEC, 0); if (status != NSS_STATUS_SUCCESS) break; diff --git a/nss/tst-nss-files-hosts-v4mapped.c b/nss/tst-nss-files-hosts-v4mapped.c new file mode 100644 index 0000000000..45582904e6 --- /dev/null +++ b/nss/tst-nss-files-hosts-v4mapped.c @@ -0,0 +1,41 @@ +/* Test lookup of IPv4 mapped addresses in files database (bug 25457) + + Copyright (C) 2023 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; see the file COPYING.LIB. If + not, see <https://www.gnu.org/licenses/>. */ + +#include <stdio.h> +#include <arpa/inet.h> +#include <netdb.h> + +static int +do_test (void) +{ + struct sockaddr_in6 s6 = { .sin6_family = AF_INET6 }; + inet_pton (AF_INET6, "::ffff:192.168.0.1", &s6.sin6_addr); + + char node[NI_MAXHOST]; + int res = getnameinfo ((struct sockaddr *) &s6, sizeof (s6), node, + sizeof (node), NULL, 0, NI_NAMEREQD); + if (res) + printf ("%d %s\n", res, gai_strerror (res)); + else + printf ("node=%s\n", node); + + return res != 0; +} + +#include <support/test-driver.c> diff --git a/nss/tst-nss-files-hosts-v4mapped.root/etc/hosts b/nss/tst-nss-files-hosts-v4mapped.root/etc/hosts new file mode 100644 index 0000000000..609b25ad39 --- /dev/null +++ b/nss/tst-nss-files-hosts-v4mapped.root/etc/hosts @@ -0,0 +1 @@ +192.168.0.1 v4mapped diff --git a/nss/tst-nss-files-hosts-v4mapped.root/etc/nsswitch.conf b/nss/tst-nss-files-hosts-v4mapped.root/etc/nsswitch.conf new file mode 100644 index 0000000000..5b0c6a4199 --- /dev/null +++ b/nss/tst-nss-files-hosts-v4mapped.root/etc/nsswitch.conf @@ -0,0 +1 @@ +hosts: files -- 2.41.0
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor