From patchwork Tue Dec 6 05:08:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elijah Conners X-Patchwork-Id: 13065423 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 234A4C352A1 for ; Tue, 6 Dec 2022 05:08:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231990AbiLFFIh (ORCPT ); Tue, 6 Dec 2022 00:08:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53904 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231694AbiLFFIg (ORCPT ); Tue, 6 Dec 2022 00:08:36 -0500 Received: from sender4-of-o56.zoho.com (sender4-of-o56.zoho.com [136.143.188.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9D22118367 for ; Mon, 5 Dec 2022 21:08:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670303303; cv=none; d=zohomail.com; s=zohoarc; b=X3V2KOlMoyAHokitzmI1bYfzohQgLnCzPxcdazQB/fUbe4v/BEfbuVFTr1kDusL4LCtLKbKvOzAntw6kzye/h5KQREmc02/zHGWcgQfQnzp8Wrt3trazdsAclFL1TkkBX4x2669rqSiUisCGMuGl0nDb9v7uMdGlt4aAbe+OjBk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670303303; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To; bh=yQq5IpyQnyu9huCF6JP8W6KShv26wACtvWdCiC965LI=; b=nlADeNUivXg0OqeV7N+PxbQKx1B4ONg8Aq70oBZWfBvqMIDD8P7ssd7YBLb+sB1DEx+oLF6Us9GVNTTO2iOpLDLkMmVzTULgPb/1yd7JIzB7iX75BM23GG6rwkwfe4iWD3bBWGeScz1T39zX3lUJHhKXjt1PmDX+tw87MvZEzrM= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass smtp.mailfrom=business@elijahpepe.com; dmarc=pass header.from= Received: from mail.zoho.com by mx.zohomail.com with SMTP id 1670303302563517.4269340082071; Mon, 5 Dec 2022 21:08:22 -0800 (PST) Date: Mon, 05 Dec 2022 21:08:22 -0800 From: Elijah Conners To: "samba-technical" , "linux-cifs" Cc: "lsalhber" , "tom" , "pc" , "sfrench" , "sprasad" Message-ID: <184e5d5c395.e6da05c53387741.2839551941271541423@elijahpepe.com> In-Reply-To: Subject: [PATCH v2] cifs: add ipv6 parsing MIME-Version: 1.0 Importance: Medium User-Agent: Zoho Mail X-Mailer: Zoho Mail Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org CIFS currently lacks IPv6 parsing, presenting complications for CIFS over IPv6. To parse both IPv4 and IPv6 addresses, the parse_srvaddr() function was altered; parse_srvaddr() now returns void. To retrieve the IP address from parse_srvaddr(), the parameters *out6 and *out32, an in6_addr and a __be32 respectively, are provided. The value of root_server_addr is determined by if those parameters are set or not. The parsing in parse_srvaddr() was updated slightly. The character addr can hold up to 46 characters, the longest a possible IPv6 address can be. In the while loop, isdigit() has been replaced with isxdigit() to account for letters present in IPv6 addresses, and *start is also checked for being a colon. Finally, the function uses inet_pton() to determine if the address is an IPv6 address; if so, *out6 is equal to in6, set by inet_pton, otherwise, *out32 is set to in_aton(addr). Signed-off-by: Elijah Conners --- fs/cifs/cifsroot.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/fs/cifs/cifsroot.c b/fs/cifs/cifsroot.c index 9e91a5a40aae..0246e0792d8e 100644 --- a/fs/cifs/cifsroot.c +++ b/fs/cifs/cifsroot.c @@ -14,6 +14,7 @@ #include #include #include +#include #define DEFAULT_MNT_OPTS \ "vers=1.0,cifsacl,mfsymlinks,rsize=1048576,wsize=65536,uid=0,gid=0," \ @@ -22,19 +23,24 @@ static char root_dev[2048] __initdata = ""; static char root_opts[1024] __initdata = DEFAULT_MNT_OPTS; -static __be32 __init parse_srvaddr(char *start, char *end) -{ - /* TODO: ipv6 support */ - char addr[sizeof("aaa.bbb.ccc.ddd")]; +static void __init parse_srvaddr(char *start, char *end, struct in6_addr *out6, __be32 *out32) +{ + char addr[INET6_ADDRSTRLEN]; + struct in6_addr in6; int i = 0; while (start < end && i < sizeof(addr) - 1) { - if (isdigit(*start) || *start == '.') + if (isxdigit(*start) || *start == '.' || *start == ':') addr[i++] = *start; start++; } addr[i] = '\0'; - return in_aton(addr); + + if (inet_pton(AF_INET6, addr, &in6) > 0) { + *out6 = in6; + } else { + *out32 = in_aton(addr); + } } /* cifsroot=///[,options] */ @@ -42,7 +48,8 @@ static int __init cifs_root_setup(char *line) { char *s; int len; - __be32 srvaddr = htonl(INADDR_NONE); + struct in6_addr addr6; + __be32 addr32; ROOT_DEV = Root_CIFS; @@ -60,7 +67,7 @@ static int __init cifs_root_setup(char *line) return 1; } strlcpy(root_dev, line, len); - srvaddr = parse_srvaddr(&line[2], s); + parse_srvaddr(&line[2], s, &addr6, &addr32); if (*s) { int n = snprintf(root_opts, sizeof(root_opts), "%s,%s", @@ -73,7 +80,11 @@ static int __init cifs_root_setup(char *line) } } - root_server_addr = srvaddr; + if (addr6.is_set) { + root_server_addr = addr6; + } else if (addr32.is_set) { + root_server_addr = addr32; + } return 1; }