From 80d8cb91dee8bdcc4e430b3e2620d95f89b1ee0b Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Thu, 15 Sep 2016 15:46:30 +0200 Subject: inet: Add __inet6_scopeid_pton function [BZ #20611] __inet6_scopeid_pton implements strict validation of numeric scope IDs. Use it in getaddrinfo and __res_vinit. --- inet/inet6_scopeid_pton.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 inet/inet6_scopeid_pton.c (limited to 'inet/inet6_scopeid_pton.c') diff --git a/inet/inet6_scopeid_pton.c b/inet/inet6_scopeid_pton.c new file mode 100644 index 0000000000..aa37392771 --- /dev/null +++ b/inet/inet6_scopeid_pton.c @@ -0,0 +1,63 @@ +/* Convert an IPv6 scope ID from text to the internal representation. + Copyright (C) 2016 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; if not, see + . */ + +#include + +#include +#include +#include +#include +#include +#include +#include + +/* Parse SOURCE as a scope ID for ADDRESS. Return 0 on success and -1 + on error. */ +internal_function int +__inet6_scopeid_pton (const struct in6_addr *address, const char *scope, + uint32_t *result) +{ + if (IN6_IS_ADDR_LINKLOCAL (address) + || IN6_IS_ADDR_MC_LINKLOCAL (address)) + { + uint32_t number = __if_nametoindex (scope); + if (number != 0) + { + *result = number; + return 0; + } + } + + if (isdigit_l (scope[0], _nl_C_locobj_ptr)) + { + char *end; + unsigned long long number + = ____strtoull_l_internal (scope, &end, /*base */ 10, /* group */ 0, + _nl_C_locobj_ptr); + if (*end == '\0' && number <= UINT32_MAX) + { + *result = number; + return 0; + } + } + + __set_errno (EINVAL); + return -1; +} + +libc_hidden_def (__inet6_scopeid_pton) -- cgit 1.4.1