Received: by 2002:a89:2c3:0:b0:1ed:23cc:44d1 with SMTP id d3csp961420lqs; Wed, 6 Mar 2024 01:58:21 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVUHgh8QrcnjpobXokkDATuZ2TCgTu4gariozvCmHTDOhcvp3EqlrarpLHRcXUTrKJrDvuNlkdbjrTiEZEc+uVdVyY9MkD2K0Xa2cgSoQ== X-Google-Smtp-Source: AGHT+IGWIxdagFxB2zQOvx7jzHio8DF8Y0kM+BsfBcD5+Myba3gVtN4R5z8KbZ/wXlqRbwTnQMzs X-Received: by 2002:a05:6871:538a:b0:21f:ca8c:d7d9 with SMTP id hy10-20020a056871538a00b0021fca8cd7d9mr4930978oac.3.1709719101241; Wed, 06 Mar 2024 01:58:21 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709719101; cv=pass; d=google.com; s=arc-20160816; b=Iy75Y8i83vatSJej2JPerJ2BaiGMYhe65miiZwq0fwvvPI22OCvzKdkyLS1pQJyD9Z dMcR5MKN5s5g9JJYQmn+Nl4Q5rzuut8nXSTZSl8/tPLYRTU+fytSh2IzRjslZupCjbba gX/z+Tvn5yqh3JWdeW5d6uwrthcjlJLVcj2xuu3vOCiG3HXTtrqjOUPc4cxfiy0Th+2Y PaSGXA4lShJupNOc2YGxs+7sEv+aX+8eSzRsZFqEerdn0NcQvljdmhlGOrs4ZwrvNXWJ RTWV1m+pKOdDe6bSKem5TSdb0F1lESMJ+UPCIdNyJrYy0iXZ7sdVN71KsP1YwWmNpYbY x38w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:dkim-signature; bh=aS/2iq54TyvTFJNOfej37LI9H38zniQqeQDzeMNsmjI=; fh=Y3pmHIqxJn04WvVEx7HcW7awW5j1YG2auzbw08CCR04=; b=HF+Fn5vsQpJC1t56wXe9vt+pXb1QsvpKZiyPBtOcI8hbtehoqZ1KLpOTRohxzJ6KsV q/4XLPa5q0G98ZI6ssKs/ZSL7bgYLEKUF4mlMuDHu3WQKkR4zx54+sdjvLgNsQC7Lr48 YOgUnjT8m0ZcXpGsZR8mA0DnAwNJrSA+n1G6tYmWO3yM6mjF/PNMRio92l0fCpWqptGT qkQIztrhGlqd5OBlQ/gRDqNBp06reS1xYjnTqjW1qi9bCb4YlQ+5iUnoVEbUvlKWfFs3 mwf4VQRSmFyORko+3bbeCPX96yl1qZXKqdbTHL3NqHOFjli7OIL+nU6HBHx99lnDPrJ7 IslA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=XFxACi2z; arc=pass (i=1 spf=pass spfdomain=redhat.com dkim=pass dkdomain=redhat.com dmarc=pass fromdomain=redhat.com); spf=pass (google.com: domain of linux-kernel+bounces-93624-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-93624-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id b2-20020a633402000000b005d79ebbdc0asi11746052pga.334.2024.03.06.01.58.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 01:58:21 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-93624-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=XFxACi2z; arc=pass (i=1 spf=pass spfdomain=redhat.com dkim=pass dkdomain=redhat.com dmarc=pass fromdomain=redhat.com); spf=pass (google.com: domain of linux-kernel+bounces-93624-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-93624-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 7D78FB238C1 for ; Wed, 6 Mar 2024 09:27:41 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4CDBE5DF16; Wed, 6 Mar 2024 09:27:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="XFxACi2z" Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6B26D5D916 for ; Wed, 6 Mar 2024 09:27:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709717253; cv=none; b=dL3rviaHGfYuF/igovckwj7dhKlR70aJg1eY6px9TMboRhXLGXligGJ7d+G7E2AyOiVbae4NuxuTiWB0hUNCER8Xkbg/3bum0n22CkTbxJfMnQ9pgaRUDo9QfH+n8ynRsFRB32NK+Xe4/yO/GzuiRwSXuX8WaCSCoh6lQRiQ8wM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709717253; c=relaxed/simple; bh=HvXNosOI8PBmaGV32V3/Wd/i++F5cG42M+SR7Lu+Z+U=; h=Content-Type:Mime-Version:Subject:From:In-Reply-To:Date:Cc: Message-Id:References:To; b=isFUBcTMX/XAb84J0+xDSiW2OFB0TlKoNGu91JFuscByCumcAmhpFVAQT2auPGfrIT3u/ZcvqXfBAOuwl6zgCPkzKDaVY3miFz0MjSNUtk6UcwT/Yrsb4LmfqkMOiXjKrX2E+08IucBW57cghctcOTaOW1pWLy0RbstGbZNzv3o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=XFxACi2z; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709717250; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aS/2iq54TyvTFJNOfej37LI9H38zniQqeQDzeMNsmjI=; b=XFxACi2zXVxcdSFg9ASSRxgrS8ve4wdK/AXqDakXyHcZvZQ1zA+rEQ0lYlucPZUobhFkx9 0bCd+/nIljIvFWp62hm+RUibCRf3X2Yn1gf5GNu41sqmaCcxi4DdCQV4dFMXXlnVBI1yFp cmDcTYIj4fQyQcA1bYL5kgYx1xfyRiY= Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-611-K2WGAHztNsm2ybP2DA1U4A-1; Wed, 06 Mar 2024 04:27:29 -0500 X-MC-Unique: K2WGAHztNsm2ybP2DA1U4A-1 Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-1dcb30afc63so71372575ad.1 for ; Wed, 06 Mar 2024 01:27:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709717248; x=1710322048; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aS/2iq54TyvTFJNOfej37LI9H38zniQqeQDzeMNsmjI=; b=ZeBJVZpJDjWfS638AWiFMfsPswNuY+QCgpRjWXyGaRa/+BcLuTQ5YNwT6NSwOtDD+I anm7OUaIZjt/DKFBRV8rfqfDwtkP5wckokS+1rrZwYmEPu8cexJLhXEP5fxMgwhsojue TEyLslQ0Yg62eHjSkQ2Db4fw9/4mZ9rC5in+j6N2XzD6h96v+pV+81PMzgFE9a1AO3Ki xve6AwpvJXxrwtWsjtvyMum8U2ANeP4lymKGd3AVL6GFLCKhSH+IXMP18vlVQKytpJTo a/RP22PVYtsPGnRTSBK/ITOdogJ6WjiXkTniCFgcRSL9iZ2wgHWC06hYX5Ke6KegpU9b uo/Q== X-Gm-Message-State: AOJu0Yw1N1mXNao0b5b1EsTuS+LAkZT74yss1Welt4SsxkqFavcaafTC ZxqzkV27+flzIXeGom3v5LY6rjF33v0rdx9t7/EiDwrqzeo+Dppot143EI0kUL+8rfd0QGGwmiz vfhXQwfoXqLQLCgeIYNiVonN9k+6UAxhsDFZwXV6BO22S41VsB5EuqPKzECSN9w== X-Received: by 2002:a17:902:e883:b0:1dc:78bc:ad0a with SMTP id w3-20020a170902e88300b001dc78bcad0amr5594452plg.36.1709717247972; Wed, 06 Mar 2024 01:27:27 -0800 (PST) X-Received: by 2002:a17:902:e883:b0:1dc:78bc:ad0a with SMTP id w3-20020a170902e88300b001dc78bcad0amr5594431plg.36.1709717247597; Wed, 06 Mar 2024 01:27:27 -0800 (PST) Received: from smtpclient.apple ([115.96.30.47]) by smtp.gmail.com with ESMTPSA id p6-20020a170902b08600b001dc30f13e6asm12024747plr.137.2024.03.06.01.27.23 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Mar 2024 01:27:26 -0800 (PST) Content-Type: text/plain; charset=us-ascii Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.400.31\)) Subject: Re: [PATCH] hv/hv_kvp_daemon: Handle IPv4 and Ipv6 combination for keyfile format From: Ani Sinha In-Reply-To: <1709297778-20420-1-git-send-email-shradhagupta@linux.microsoft.com> Date: Wed, 6 Mar 2024 14:57:12 +0530 Cc: linux-kernel@vger.kernel.org, linux-hyperv@vger.kernel.org, "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Long Li , Michael Kelley , Olaf Hering , Shradha Gupta Content-Transfer-Encoding: quoted-printable Message-Id: <4547D425-64EF-4974-A131-56811F25B9E6@redhat.com> References: <1709297778-20420-1-git-send-email-shradhagupta@linux.microsoft.com> To: Shradha Gupta X-Mailer: Apple Mail (2.3774.400.31) > On 01-Mar-2024, at 18:26, Shradha Gupta = wrote: >=20 > If the network configuration strings are passed as a combination of = IPv and > IPv6 addresses, the current KVP daemon doesnot handle it for the = keyfile > configuration format. > With these changes, the keyfile config generation logic scans through = the > list twice to generate IPv4 and IPv6 sections for the configuration = files > to handle this support. >=20 > Built-on: Rhel9 > Tested-on: Rhel9(IPv4 only, IPv6 only, IPv4 and IPv6 combination) > Signed-off-by: Shradha Gupta > --- > tools/hv/hv_kvp_daemon.c | 152 ++++++++++++++++++++++++++++----------- > 1 file changed, 112 insertions(+), 40 deletions(-) >=20 > diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c > index 318e2dad27e0..7e84e40b55fb 100644 > --- a/tools/hv/hv_kvp_daemon.c > +++ b/tools/hv/hv_kvp_daemon.c > @@ -76,6 +76,11 @@ enum { > DNS > }; >=20 > +enum { > + IPV4 =3D 1, > + IPV6 > +}; > + > static int in_hand_shake; >=20 > static char *os_name =3D ""; > @@ -1171,6 +1176,18 @@ static int process_ip_string(FILE *f, char = *ip_string, int type) > return 0; > } >=20 > +int ip_version_check(const char *input_addr) > +{ > + struct in6_addr addr; > + > + if (inet_pton(AF_INET, input_addr, &addr)) > + return IPV4; > + else if (inet_pton(AF_INET6, input_addr, &addr)) > + return IPV6; > + else > + return -EINVAL; > +} > + > /* > * Only IPv4 subnet strings needs to be converted to plen > * For IPv6 the subnet is already privided in plen format > @@ -1197,14 +1214,56 @@ static int kvp_subnet_to_plen(char = *subnet_addr_str) > return plen; > } >=20 > +static int process_dns_gateway_nm(FILE *f, char *ip_string, int type, > + int ip_sec) > +{ > + char addr[INET6_ADDRSTRLEN], *output_str; > + int ip_offset =3D 0, error, ip_ver; > + char *param_name; > + > + output_str =3D malloc(strlen(ip_string)); > + > + if (!output_str) > + return 1; > + > + output_str[0] =3D '\0'; > + > + if (type =3D=3D DNS) > + param_name =3D "dns"; > + else > + param_name =3D "gateway"; > + > + while (parse_ip_val_buffer(ip_string, &ip_offset, addr, > + (MAX_IP_ADDR_SIZE * 2))) { > + ip_ver =3D ip_version_check(addr); > + > + if ((ip_ver =3D=3D IPV4 && ip_sec =3D=3D IPV4) || > + (ip_ver =3D=3D IPV6 && ip_sec =3D=3D IPV6)) { > + strcat(output_str, addr); > + strcat(output_str, ","); We need to check if we are not going out of bounds here. So existing = length of output_str + length of addr + 1 should be < strlen(ip_string) = which is the length of the buffer. See parse_ip_val_buffer() how it does = out of bounds check. > + } else { > + continue; > + } > + } > + > + if (strlen(output_str)) { > + output_str[strlen(output_str) - 1] =3D '\0'; > + error =3D fprintf(f, "%s=3D%s\n", param_name, output_str); > + if (error < 0) > + return error; > + } > + > + return 0; > +} > + > static int process_ip_string_nm(FILE *f, char *ip_string, char = *subnet, > - int is_ipv6) > + int ip_sec) > { > char addr[INET6_ADDRSTRLEN]; > char subnet_addr[INET6_ADDRSTRLEN]; > int error, i =3D 0; > int ip_offset =3D 0, subnet_offset =3D 0; > - int plen; > + int plen, ip_ver; >=20 > memset(addr, 0, sizeof(addr)); > memset(subnet_addr, 0, sizeof(subnet_addr)); > @@ -1216,10 +1275,13 @@ static int process_ip_string_nm(FILE *f, char = *ip_string, char *subnet, > subnet_addr, > (MAX_IP_ADDR_SIZE * > 2))) { > - if (!is_ipv6) > + ip_ver =3D ip_version_check(addr); > + if (ip_ver =3D=3D IPV4 && ip_sec =3D=3D IPV4) > plen =3D kvp_subnet_to_plen((char *)subnet_addr); > - else > + else if (ip_ver =3D=3D IPV6 && ip_sec =3D=3D IPV6) > plen =3D atoi(subnet_addr); > + else > + continue; >=20 > if (plen < 0) > return plen; > @@ -1242,8 +1304,8 @@ static int kvp_set_ip_info(char *if_name, struct = hv_kvp_ipaddr_value *new_val) > char if_filename[PATH_MAX]; > char nm_filename[PATH_MAX]; > FILE *ifcfg_file, *nmfile; > + int ip_sections_count; > char cmd[PATH_MAX]; > - int is_ipv6 =3D 0; > char *mac_addr; > int str_len; >=20 > @@ -1421,52 +1483,62 @@ static int kvp_set_ip_info(char *if_name, = struct hv_kvp_ipaddr_value *new_val) > if (error) > goto setval_error; >=20 > - if (new_val->addr_family & ADDR_FAMILY_IPV6) { > - error =3D fprintf(nmfile, "\n[ipv6]\n"); > - if (error < 0) > - goto setval_error; > - is_ipv6 =3D 1; > - } else { > - error =3D fprintf(nmfile, "\n[ipv4]\n"); > - if (error < 0) > - goto setval_error; > - } > - > /* > - * Now we populate the keyfile format > + * The keyfile format expects the IPv6 and IPv4 configuration in > + * different sections. Therefore we iterate through the list twice, > + * once to populate the IPv4 section and the next time for IPv6 > */ > + ip_sections_count =3D 1; > + do { > + if (ip_sections_count =3D=3D 1) { > + error =3D fprintf(nmfile, "\n[ipv4]\n"); > + if (error < 0) > + goto setval_error; > + } else { > + error =3D fprintf(nmfile, "\n[ipv6]\n"); > + if (error < 0) > + goto setval_error; > + } >=20 > - if (new_val->dhcp_enabled) { > - error =3D kvp_write_file(nmfile, "method", "", "auto"); > - if (error < 0) > - goto setval_error; > - } else { > - error =3D kvp_write_file(nmfile, "method", "", "manual"); > + /* > + * Now we populate the keyfile format > + */ > + > + if (new_val->dhcp_enabled) { > + error =3D kvp_write_file(nmfile, "method", "", "auto"); > + if (error < 0) > + goto setval_error; > + } else { > + error =3D kvp_write_file(nmfile, "method", "", "manual"); > + if (error < 0) > + goto setval_error; > + } > + > + /* > + * Write the configuration for ipaddress, netmask, gateway and > + * name services > + */ > + error =3D process_ip_string_nm(nmfile, (char *)new_val->ip_addr, > + (char *)new_val->sub_net, > + ip_sections_count); > if (error < 0) > goto setval_error; > - } >=20 > - /* > - * Write the configuration for ipaddress, netmask, gateway and > - * name services > - */ > - error =3D process_ip_string_nm(nmfile, (char *)new_val->ip_addr, > - (char *)new_val->sub_net, is_ipv6); > - if (error < 0) > - goto setval_error; > - > - /* we do not want ipv4 addresses in ipv6 section and vice versa */ > - if (is_ipv6 !=3D is_ipv4((char *)new_val->gate_way)) { > - error =3D fprintf(nmfile, "gateway=3D%s\n", (char = *)new_val->gate_way); > + error =3D process_dns_gateway_nm(nmfile, > + (char *)new_val->gate_way, > + GATEWAY, ip_sections_count); > if (error < 0) > goto setval_error; > - } >=20 > - if (is_ipv6 !=3D is_ipv4((char *)new_val->dns_addr)) { > - error =3D fprintf(nmfile, "dns=3D%s\n", (char *)new_val->dns_addr); > + error =3D process_dns_gateway_nm(nmfile, > + (char *)new_val->dns_addr, DNS, > + ip_sections_count); > if (error < 0) > goto setval_error; > - } > + > + ip_sections_count++; > + } while (ip_sections_count <=3D 2); > + > fclose(nmfile); > fclose(ifcfg_file); >=20 > --=20 > 2.34.1 >=20