p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

um: remove uses of variable length arrays 

While the affected code is run in user-mode, the build still warns
about it. Convert all uses of VLA to dynamic allocations.

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
This commit is contained in:
Bartosz Golaszewski 2019-04-11 11:49:42 +02:00 committed by Richard Weinberger
parent 4b6b4c9029
commit 0d4e5ac7e7
1 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
arch/um/os-Linux/umid.c
View File

@ -135,12 +135,18 @@ static int remove_files_and_dir(char *dir)
*/ */
static inline int is_umdir_used(char *dir) static inline int is_umdir_used(char *dir)
{ {
char file[strlen(uml_dir) + UMID_LEN + sizeof("/pid\0")]; char pid[sizeof("nnnnn\0")], *end, *file;
char pid[sizeof("nnnnn\0")], *end;
int dead, fd, p, n, err; int dead, fd, p, n, err;
size_t filelen;
n = snprintf(file, sizeof(file), "%s/pid", dir); err = asprintf(&file, "%s/pid", dir);
if (n >= sizeof(file)) { if (err < 0)
return 0;
filelen = strlen(file);
n = snprintf(file, filelen, "%s/pid", dir);
if (n >= filelen) {
printk(UM_KERN_ERR "is_umdir_used - pid filename too long\n"); printk(UM_KERN_ERR "is_umdir_used - pid filename too long\n");
err = -E2BIG; err = -E2BIG;
goto out; goto out;
@ -185,6 +191,7 @@ static inline int is_umdir_used(char *dir)
out_close: out_close:
close(fd); close(fd);
out: out:
free(file);
return 0; return 0;
} }
@ -210,18 +217,21 @@ static int umdir_take_if_dead(char *dir)
static void __init create_pid_file(void) static void __init create_pid_file(void)
{ {
char file[strlen(uml_dir) + UMID_LEN + sizeof("/pid\0")]; char pid[sizeof("nnnnn\0")], *file;
char pid[sizeof("nnnnn\0")];
int fd, n; int fd, n;
if (umid_file_name("pid", file, sizeof(file))) file = malloc(strlen(uml_dir) + UMID_LEN + sizeof("/pid\0"));
if (!file)
return; return;
if (umid_file_name("pid", file, sizeof(file)))
goto out;
fd = open(file, O_RDWR | O_CREAT | O_EXCL, 0644); fd = open(file, O_RDWR | O_CREAT | O_EXCL, 0644);
if (fd < 0) { if (fd < 0) {
printk(UM_KERN_ERR "Open of machine pid file \"%s\" failed: " printk(UM_KERN_ERR "Open of machine pid file \"%s\" failed: "
"%s\n", file, strerror(errno)); "%s\n", file, strerror(errno));
return; goto out;
} }
snprintf(pid, sizeof(pid), "%d\n", getpid()); snprintf(pid, sizeof(pid), "%d\n", getpid());
@ -231,6 +241,8 @@ static void __init create_pid_file(void)
errno); errno);
close(fd); close(fd);
out:
free(file);
} }
int __init set_umid(char *name) int __init set_umid(char *name)
@ -385,13 +397,19 @@ __uml_setup("uml_dir=", set_uml_dir,
static void remove_umid_dir(void) static void remove_umid_dir(void)
{ {
char dir[strlen(uml_dir) + UMID_LEN + 1], err; char *dir, err;
dir = malloc(strlen(uml_dir) + UMID_LEN + 1);
if (!dir)
return;
sprintf(dir, "%s%s", uml_dir, umid); sprintf(dir, "%s%s", uml_dir, umid);
err = remove_files_and_dir(dir); err = remove_files_and_dir(dir);
if (err) if (err)
os_warn("%s - remove_files_and_dir failed with err = %d\n", os_warn("%s - remove_files_and_dir failed with err = %d\n",
__func__, err); __func__, err);
free(dir);
} }
__uml_exitcall(remove_umid_dir); __uml_exitcall(remove_umid_dir);