[folded-merged] init-add-hostname-kernel-parameter-v2.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The quilt patch titled
     Subject: init-add-hostname-kernel-parameter-v2
has been removed from the -mm tree.  Its filename was
     init-add-hostname-kernel-parameter-v2.patch

This patch was dropped because it was folded into init-add-hostname-kernel-parameter.patch

------------------------------------------------------
From: Dan Moulding <dmoulding@xxxxxx>
Subject: init-add-hostname-kernel-parameter-v2

Link: https://lkml.kernel.org/r/20220506060310.7495-2-dmoulding@xxxxxx
Signed-off-by: Dan Moulding <dmoulding@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 Documentation/admin-guide/kernel-parameters.txt |    4 ++--
 init/version.c                                  |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

--- a/Documentation/admin-guide/kernel-parameters.txt~init-add-hostname-kernel-parameter-v2
+++ a/Documentation/admin-guide/kernel-parameters.txt
@@ -1665,6 +1665,8 @@
 			Valid parameters: "on", "off"
 			Default: "on"
 
+	hlt		[BUGS=ARM,SH]
+
 	hostname=	[KNL] Set the hostname (aka UTS nodename).
 			Format: <string>
 			This allows setting the system's hostname during early
@@ -1678,8 +1680,6 @@
 			not exceed the maximum allowed hostname length (usually
 			64 characters) and will be truncated otherwise.
 
-	hlt		[BUGS=ARM,SH]
-
 	hpet=		[X86-32,HPET] option to control HPET usage
 			Format: { enable (default) | disable | force |
 				verbose }
--- a/init/version.c~init-add-hostname-kernel-parameter-v2
+++ a/init/version.c
@@ -41,12 +41,12 @@ static int __init early_hostname(char *a
 {
 	size_t bufsize = sizeof(init_uts_ns.name.nodename);
 	size_t maxlen  = bufsize - 1;
+	size_t arglen;
 
-	strncpy(init_uts_ns.name.nodename, arg, bufsize);
-	if (strlen(arg) > maxlen) {
+	arglen = strlcpy(init_uts_ns.name.nodename, arg, bufsize);
+	if (arglen > maxlen) {
 		pr_warn("hostname parameter exceeds %zd characters and will be truncated",
 			maxlen);
-		init_uts_ns.name.nodename[maxlen] = '\0';
 	}
 	return 0;
 }
_

Patches currently in -mm which might be from dmoulding@xxxxxx are

init-add-hostname-kernel-parameter.patch




[Index of Archives]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux