chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix randonm findings from llvm-clang-analyzer
[elogind.git]
/
libudev
/
libudev-util-private.c
diff --git
a/libudev/libudev-util-private.c
b/libudev/libudev-util-private.c
index 021734d77245af918b5c1ae95a6ed3c1ae22efe9..e0670dbae5dcacb525e89db5e8c9eca5370f612d 100644
(file)
--- a/
libudev/libudev-util-private.c
+++ b/
libudev/libudev-util-private.c
@@
-1,7
+1,7
@@
/*
* libudev - interface to udev device information
*
/*
* libudev - interface to udev device information
*
- * Copyright (C) 200
4
-2009 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 200
3
-2009 Kay Sievers <kay.sievers@vrfy.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@
-30,15
+30,16
@@
int util_create_path(struct udev *udev, const char *path)
char p[UTIL_PATH_SIZE];
char *pos;
struct stat stats;
char p[UTIL_PATH_SIZE];
char *pos;
struct stat stats;
- int
ret
;
+ int
err
;
util_strscpy(p, sizeof(p), path);
pos = strrchr(p, '/');
util_strscpy(p, sizeof(p), path);
pos = strrchr(p, '/');
- if (pos ==
p || pos ==
NULL)
+ if (pos == NULL)
return 0;
return 0;
-
- while (pos[-1] == '/')
+ while (pos != p && pos[-1] == '/')
pos--;
pos--;
+ if (pos == p)
+ return 0;
pos[0] = '\0';
dbg(udev, "stat '%s'\n", p);
pos[0] = '\0';
dbg(udev, "stat '%s'\n", p);
@@
-50,15
+51,12
@@
int util_create_path(struct udev *udev, const char *path)
dbg(udev, "mkdir '%s'\n", p);
udev_selinux_setfscreatecon(udev, p, S_IFDIR|0755);
dbg(udev, "mkdir '%s'\n", p);
udev_selinux_setfscreatecon(udev, p, S_IFDIR|0755);
- ret = mkdir(p, 0755);
- udev_selinux_resetfscreatecon(udev);
- if (ret == 0)
- return 0;
-
- if (errno == EEXIST)
+ err = mkdir(p, 0755);
+ if (err != 0 && errno == EEXIST)
if (stat(p, &stats) == 0 && (stats.st_mode & S_IFMT) == S_IFDIR)
if (stat(p, &stats) == 0 && (stats.st_mode & S_IFMT) == S_IFDIR)
- return 0;
- return -1;
+ err = 0;
+ udev_selinux_resetfscreatecon(udev);
+ return err;
}
int util_delete_path(struct udev *udev, const char *path)
}
int util_delete_path(struct udev *udev, const char *path)
@@
-67,7
+65,10
@@
int util_delete_path(struct udev *udev, const char *path)
char *pos;
int retval;
char *pos;
int retval;
- strcpy (p, path);
+ if (path[0] == '/')
+ while(path[1] == '/')
+ path++;
+ util_strscpy(p, sizeof(p), path);
pos = strrchr(p, '/');
if (pos == p || pos == NULL)
return 0;
pos = strrchr(p, '/');
if (pos == p || pos == NULL)
return 0;
@@
-96,28
+97,20
@@
int util_delete_path(struct udev *udev, const char *path)
}
/* Reset permissions on the device node, before unlinking it to make sure,
}
/* Reset permissions on the device node, before unlinking it to make sure,
- * that permisions of possible hard links will be removed too.
+ * that permis
s
ions of possible hard links will be removed too.
*/
int util_unlink_secure(struct udev *udev, const char *filename)
{
*/
int util_unlink_secure(struct udev *udev, const char *filename)
{
- int retval;
-
- retval = chown(filename, 0, 0);
- if (retval)
- err(udev, "chown(%s, 0, 0) failed: %m\n", filename);
-
- retval = chmod(filename, 0000);
- if (retval)
- err(udev, "chmod(%s, 0000) failed: %m\n", filename);
+ int err;
- retval = unlink(filename);
+ chmod(filename, 0000);
+ chown(filename, 0, 0);
+ err = unlink(filename);
if (errno == ENOENT)
if (errno == ENOENT)
- retval = 0;
-
- if (retval)
+ err = 0;
+ if (err)
err(udev, "unlink(%s) failed: %m\n", filename);
err(udev, "unlink(%s) failed: %m\n", filename);
-
- return retval;
+ return err;
}
uid_t util_lookup_user(struct udev *udev, const char *user)
}
uid_t util_lookup_user(struct udev *udev, const char *user)
@@
-135,8
+128,7
@@
uid_t util_lookup_user(struct udev *udev, const char *user)
if (endptr[0] == '\0')
return uid;
if (endptr[0] == '\0')
return uid;
- errno = 0;
- getpwnam_r(user, &pwbuf, buf, buflen, &pw);
+ errno = getpwnam_r(user, &pwbuf, buf, buflen, &pw);
if (pw != NULL)
return pw->pw_uid;
if (errno == 0 || errno == ENOENT || errno == ESRCH)
if (pw != NULL)
return pw->pw_uid;
if (errno == 0 || errno == ENOENT || errno == ESRCH)
@@
-149,7
+141,7
@@
uid_t util_lookup_user(struct udev *udev, const char *user)
gid_t util_lookup_group(struct udev *udev, const char *group)
{
char *endptr;
gid_t util_lookup_group(struct udev *udev, const char *group)
{
char *endptr;
- int buflen;
+ int buflen
= sysconf(_SC_GETGR_R_SIZE_MAX)
;
char *buf;
struct group grbuf;
struct group *gr;
char *buf;
struct group grbuf;
struct group *gr;
@@
-160,28
+152,26
@@
gid_t util_lookup_group(struct udev *udev, const char *group)
gid = strtoul(group, &endptr, 10);
if (endptr[0] == '\0')
return gid;
gid = strtoul(group, &endptr, 10);
if (endptr[0] == '\0')
return gid;
-
- buflen = sysconf(_SC_GETGR_R_SIZE_MAX);
- if (buflen < 0)
- buflen = 1000;
buf = NULL;
gid = 0;
for (;;) {
buf = NULL;
gid = 0;
for (;;) {
- buf = realloc(buf, buflen);
- if (!buf)
+ char *newbuf;
+
+ newbuf = realloc(buf, buflen);
+ if (!newbuf)
break;
break;
-
errno = 0
;
- getgrnam_r(group, &grbuf, buf, buflen, &gr);
- if (gr != NULL)
+
buf = newbuf
;
+
errno =
getgrnam_r(group, &grbuf, buf, buflen, &gr);
+ if (gr != NULL)
{
gid = gr->gr_gid;
gid = gr->gr_gid;
- else if (errno == ERANGE) {
+
}
else if (errno == ERANGE) {
buflen *= 2;
continue;
buflen *= 2;
continue;
- }
- else if (errno == 0 || errno == ENOENT || errno == ESRCH)
+ } else if (errno == 0 || errno == ENOENT || errno == ESRCH) {
err(udev, "specified group '%s' unknown\n", group);
err(udev, "specified group '%s' unknown\n", group);
- else
+ } else {
err(udev, "error resolving group '%s': %m\n", group);
err(udev, "error resolving group '%s': %m\n", group);
+ }
break;
}
free(buf);
break;
}
free(buf);
@@
-252,7
+242,8
@@
int util_resolve_subsys_kernel(struct udev *udev, const char *string,
}
int util_run_program(struct udev *udev, const char *command, char **envp,
}
int util_run_program(struct udev *udev, const char *command, char **envp,
- char *result, size_t ressize, size_t *reslen)
+ char *result, size_t ressize, size_t *reslen,
+ const sigset_t *sigmask)
{
int status;
int outpipe[2] = {-1, -1};
{
int status;
int outpipe[2] = {-1, -1};
@@
-260,7
+251,7
@@
int util_run_program(struct udev *udev, const char *command, char **envp,
pid_t pid;
char arg[UTIL_PATH_SIZE];
char program[UTIL_PATH_SIZE];
pid_t pid;
char arg[UTIL_PATH_SIZE];
char program[UTIL_PATH_SIZE];
- char *argv[(
sizeof(arg
) / 2) + 1];
+ char *argv[(
(sizeof(arg) + 1
) / 2) + 1];
int devnull;
int i;
int err = 0;
int devnull;
int i;
int err = 0;
@@
-278,10
+269,14
@@
int util_run_program(struct udev *udev, const char *command, char **envp,
/* do not separate quotes */
pos++;
argv[i] = strsep(&pos, "\'");
/* do not separate quotes */
pos++;
argv[i] = strsep(&pos, "\'");
- while (pos != NULL && pos[0] == ' ')
- pos++;
+ if (pos != NULL)
+ while (pos[0] == ' ')
+ pos++;
} else {
argv[i] = strsep(&pos, " ");
} else {
argv[i] = strsep(&pos, " ");
+ if (pos != NULL)
+ while (pos[0] == ' ')
+ pos++;
}
dbg(udev, "arg[%i] '%s'\n", i, argv[i]);
i++;
}
dbg(udev, "arg[%i] '%s'\n", i, argv[i]);
i++;
@@
-340,9
+335,13
@@
int util_run_program(struct udev *udev, const char *command, char **envp,
dup2(errpipe[WRITE_END], STDERR_FILENO);
close(errpipe[WRITE_END]);
}
dup2(errpipe[WRITE_END], STDERR_FILENO);
close(errpipe[WRITE_END]);
}
+
+ if (sigmask)
+ sigprocmask(SIG_BLOCK, sigmask, NULL);
+
execve(argv[0], argv, envp);
if (errno == ENOENT || errno == ENOTDIR) {
execve(argv[0], argv, envp);
if (errno == ENOENT || errno == ENOTDIR) {
- /* may be on a filesytem which is not mounted right now */
+ /* may be on a filesy
s
tem which is not mounted right now */
info(udev, "program '%s' not found\n", argv[0]);
} else {
/* other problems */
info(udev, "program '%s' not found\n", argv[0]);
} else {
/* other problems */