VesperOS/shadow
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib/: Don't say 'len' where 'size' is meant

Browse Source 
Fixes: 45c6603cc8 ("[svn-upgrade] Integrating new upstream version, shadow (19990709)")
Fixes: 3b7cc05387 ("lib: replace `USER_NAME_MAX_LENGTH` macro")
Fixes: 6be85b0baf ("lib/chkname.c: Use tmp variable to avoid a -Wsign-compare warning")
See-also: 403a2e3771 ("lib/chkname.c: Take NUL byte into account")
See-also: 6a1f45d932 ("lib/chkname.c: Support unlimited user name lengths")
Fixes: 95ea61009d ("lib/chkname.c: Use precise comment")
Reviewed-by: Iker Pedrosa <ipedrosa@redhat.com>
Cc: Tobias Stoeckmann <tobias@stoeckmann.org>
Cc: Serge Hallyn <serge@hallyn.com>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
This commit is contained in:
Alejandro Colomar
2024-02-13 16:13:05 -06:00
committed by Serge Hallyn
parent 6551709e96
commit 51cd6aec02
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/chkname.c
+5 -8
View File
@@ -76,16 +76,13 @@ static bool is_valid_name (const char *name)
bool is_valid_user_name (const char *name)
{
long maxlen;
long maxsize;
/*
* User name length should be limited by the kernel
*/
errno = 0;
maxlen = sysconf(_SC_LOGIN_NAME_MAX);
if (maxlen == -1 && errno != 0)
maxlen = LOGIN_NAME_MAX;
if (maxlen != -1 && strlen(name) >= (size_t)maxlen)
maxsize = sysconf(_SC_LOGIN_NAME_MAX);
if (maxsize == -1 && errno != 0)
maxsize = LOGIN_NAME_MAX;
if (maxsize != -1 && strlen(name) >= (size_t)maxsize)
return false;
return is_valid_name (name);
lib/prototypes.h
+2 -2
View File
@@ -365,8 +365,8 @@ unsigned long csrand_interval (unsigned long min, unsigned long max);
extern int remove_tree (const char *root, bool remove_root);
/* rlogin.c */
extern int do_rlogin (const char *remote_host, char *name, size_t namelen,
char *term, size_t termlen);
extern int do_rlogin(const char *remote_host, char *name, size_t namesize,
char *term, size_t termsize);
/* root_flag.c */
extern void process_root_flag (const char* short_opt, int argc, char **argv);
lib/rlogin.c
+11 -8
View File
@@ -41,7 +41,9 @@ static struct {
{ -1, -1}
};
static void get_remote_string (char *buf, size_t size)
static void
get_remote_string(char *buf, size_t size)
{
for (;;) {
if (read (0, buf, 1) != 1) {
@@ -55,11 +57,13 @@ static void get_remote_string (char *buf, size_t size)
++buf;
}
}
/*NOTREACHED*/}
/*NOTREACHED*/
}
int
do_rlogin (const char *remote_host, char *name, size_t namelen, char *term,
size_t termlen)
do_rlogin(const char *remote_host, char *name, size_t namesize, char *term,
size_t termsize)
{
struct passwd *pwd;
char remote_name[32];
@@ -69,9 +73,9 @@ do_rlogin (const char *remote_host, char *name, size_t namelen, char *term,
int i;
TERMIO termio;
get_remote_string (remote_name, sizeof remote_name);
get_remote_string (name, namelen);
get_remote_string (term, termlen);
get_remote_string(remote_name, sizeof(remote_name));
get_remote_string(name, namesize);
get_remote_string(term, termsize);
cp = strchr (term, '/');
if (NULL != cp) {
@@ -126,4 +130,3 @@ do_rlogin (const char *remote_host, char *name, size_t namelen, char *term,
#endif
}
#endif /* RLOGIN */