From: Sami Kerola <kerolasa@iki.fi>
Date: Fri, 13 Nov 2020 21:25:02 +0000 (+0000)
Subject: login: use system definitions to determine maxium login name length
X-Git-Tag: v2.37-rc1~250
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d51538190134e490fa1a26b7ea6ac4956bf64076;p=thirdparty%2Futil-linux.git

login: use system definitions to determine maxium login name length

Allocating stack for about 10x more than longest possible user name is
wasteful, even if it happens for reletively short period of time.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/login-utils/login.c b/login-utils/login.c
index b03808a5c2..0e7629f20f 100644
--- a/login-utils/login.c
+++ b/login-utils/login.c
@@ -91,10 +91,6 @@
 # define TTY_MODE 0600
 #endif
 
-#ifndef SPT_BUFSIZE
-# define SPT_BUFSIZE     2048
-#endif
-
 static char **argv0;
 static size_t argv_lth;
 
@@ -260,18 +256,19 @@ static void process_title_init (int argc, char **argv)
 		argv0 = argv;
 }
 
-static void process_title_update (const char *prog, const char *txt)
+static void process_title_update(const char *username)
 {
         size_t i;
-        char buf[SPT_BUFSIZE];
+        const char prefix[] = "login -- ";
+        char buf[sizeof(prefix) + LOGIN_NAME_MAX];
 
         if (!argv0)
                 return;
 
-	if (strlen(prog) + strlen(txt) + 5 > SPT_BUFSIZE)
+	if (sizeof(buf) < (sizeof(prefix) + strlen(username) + 1))
 		return;
 
-	sprintf(buf, "%s -- %s", prog, txt);
+	snprintf(buf, sizeof(buf), "%s%s", prefix, username);
 
         i = strlen(buf);
         if (i > argv_lth - 2) {
@@ -1452,7 +1449,7 @@ int main(int argc, char **argv)
 
 	init_environ(&cxt);		/* init $HOME, $TERM ... */
 
-	process_title_update("login", cxt.username);
+	process_title_update(cxt.username);
 
 	log_syslog(&cxt);