xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: ipconfig: Don't override command-line hostnames or domains

Browse Source 
[ Upstream commit b508d5fb69c2211a1b860fc058aafbefc3b3c3cd ]

If the user specifies a hostname or domain name as part of the ip=
command-line option, preserve it and don't overwrite it with one
supplied by DHCP/BOOTP.

For instance, ip=::::myhostname::dhcp will use "myhostname" rather than
ignoring and overwriting it.

Fix the comment on ic_bootp_string that suggests it only copies a string
"if not already set"; it doesn't have any such logic.

Signed-off-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Josh Triplett
2021-06-01 18:38:41 -07:00
committed by Greg Kroah-Hartman
parent 511a010291
commit ecd26536ec
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
net/ipv4/ipconfig.c
View File

@@ -870,7 +870,7 @@ static void __init ic_bootp_send_if(struct ic_device *d, unsigned long jiffies_d
/* /*
* Copy BOOTP-supplied string if not already set. * Copy BOOTP-supplied string
*/ */
static int __init ic_bootp_string(char *dest, char *src, int len, int max) static int __init ic_bootp_string(char *dest, char *src, int len, int max)
{ {
@@ -919,12 +919,15 @@ static void __init ic_do_bootp_ext(u8 *ext)
} }
break; break;
case 12: /* Host name */ case 12: /* Host name */
ic_bootp_string(utsname()->nodename, ext+1, *ext, if (!ic_host_name_set) {
__NEW_UTS_LEN); ic_bootp_string(utsname()->nodename, ext+1, *ext,
ic_host_name_set = 1; __NEW_UTS_LEN);
ic_host_name_set = 1;
}
break; break;
case 15: /* Domain name (DNS) */ case 15: /* Domain name (DNS) */
ic_bootp_string(ic_domain, ext+1, *ext, sizeof(ic_domain)); if (!ic_domain[0])
ic_bootp_string(ic_domain, ext+1, *ext, sizeof(ic_domain));
break; break;
case 17: /* Root path */ case 17: /* Root path */
if (!root_server_path[0]) if (!root_server_path[0])