From: Florian Weimer <fweimer@redhat.com>
To: libc-alpha@sourceware.org
Subject: [PATCH v2 03/13] resolv: Add internal __res_binary_hnok function
Date: Fri, 26 Aug 2022 12:33:28 +0200 [thread overview]
Message-ID: <dc060e3166aa0ee7e52478d9180ad6950b7a93d2.1661509943.git.fweimer@redhat.com> (raw)
In-Reply-To: <cover.1661509943.git.fweimer@redhat.com>
During package parsing, only the binary representation is available,
and it is convenient to check that directly for conformance with host
name requirements.
Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
---
include/resolv.h | 3 +++
resolv/res-name-checking.c | 14 +++++++++-----
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/include/resolv.h b/include/resolv.h
index 3590b6f496..4dbbac3800 100644
--- a/include/resolv.h
+++ b/include/resolv.h
@@ -70,5 +70,8 @@ libc_hidden_proto (__libc_res_nameinquery)
extern __typeof (__res_queriesmatch) __libc_res_queriesmatch;
libc_hidden_proto (__libc_res_queriesmatch)
+/* Variant of res_hnok which operates on binary (but uncompressed) names. */
+bool __res_binary_hnok (const unsigned char *dn) attribute_hidden;
+
# endif /* _RESOLV_H_ && !_ISOMAC */
#endif
diff --git a/resolv/res-name-checking.c b/resolv/res-name-checking.c
index 07a412d8ff..213edceaf3 100644
--- a/resolv/res-name-checking.c
+++ b/resolv/res-name-checking.c
@@ -138,6 +138,12 @@ binary_leading_dash (const unsigned char *dn)
return dn[0] > 0 && dn[1] == '-';
}
+bool
+__res_binary_hnok (const unsigned char *dn)
+{
+ return !binary_leading_dash (dn) && binary_hnok (dn);
+}
+
/* Return 1 if res_hnok is a valid host name. Labels must only
contain [0-9a-zA-Z_-] characters, and the name must not start with
a '-'. The latter is to avoid confusion with program options. */
@@ -145,11 +151,9 @@ int
___res_hnok (const char *dn)
{
unsigned char buf[NS_MAXCDNAME];
- if (!printable_string (dn)
- || __ns_name_pton (dn, buf, sizeof (buf)) < 0
- || binary_leading_dash (buf))
- return 0;
- return binary_hnok (buf);
+ return (printable_string (dn)
+ && __ns_name_pton (dn, buf, sizeof (buf)) >= 0
+ && __res_binary_hnok (buf));
}
versioned_symbol (libc, ___res_hnok, res_hnok, GLIBC_2_34);
versioned_symbol (libc, ___res_hnok, __libc_res_hnok, GLIBC_PRIVATE);
--
2.37.1
next prev parent reply other threads:[~2022-08-26 10:33 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-26 10:33 [PATCH v2 00/13] nss_dns: Fix handling of non-host CNAMEs (bug 12154) Florian Weimer
2022-08-26 10:33 ` [PATCH v2 01/13] resolv: Add tst-resolv-byaddr for testing reverse lookup Florian Weimer
2022-08-29 19:56 ` Siddhesh Poyarekar
2022-08-26 10:33 ` [PATCH v2 02/13] resolv: Add tst-resolv-aliases Florian Weimer
2022-08-29 19:57 ` Siddhesh Poyarekar
2022-08-26 10:33 ` Florian Weimer [this message]
2022-08-26 10:33 ` [PATCH v2 04/13] resolv: Add the __ns_samebinaryname function Florian Weimer
2022-08-26 10:33 ` [PATCH v2 05/13] resolv: Add internal __ns_name_length_uncompressed function Florian Weimer
2022-08-26 10:33 ` [PATCH v2 06/13] resolv: Add DNS packet parsing helpers geared towards wire format Florian Weimer
2022-08-26 10:33 ` [PATCH v2 07/13] nss_dns: Split getanswer_ptr from getanswer_r Florian Weimer
2022-08-26 10:33 ` [PATCH v2 08/13] nss_dns: Rewrite _nss_dns_gethostbyaddr2_r and getanswer_ptr Florian Weimer
2022-08-26 10:33 ` [PATCH v2 09/13] nss_dns: Remove remnants of IPv6 address mapping Florian Weimer
2022-08-26 10:34 ` [PATCH v2 10/13] nss_dns: Rewrite getanswer_r to match getanswer_ptr (bug 12154, bug 29305) Florian Weimer
2022-08-26 10:34 ` [PATCH v2 11/13] nss_dns: In gaih_getanswer_slice, skip strange aliases (bug 12154) Florian Weimer
2022-08-26 10:34 ` [PATCH v2 12/13] resolv: Add new tst-resolv-invalid-cname Florian Weimer
2022-08-30 10:59 ` Szabolcs Nagy
2022-08-30 11:13 ` Florian Weimer
2022-08-26 10:34 ` [PATCH v2 13/13] nss_dns: Rewrite _nss_dns_gethostbyname4_r using current interfaces Florian Weimer
2022-08-29 20:01 ` Siddhesh Poyarekar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=dc060e3166aa0ee7e52478d9180ad6950b7a93d2.1661509943.git.fweimer@redhat.com \
--to=fweimer@redhat.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).