chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
release 110
[elogind.git]
/
udev_selinux.c
diff --git
a/udev_selinux.c
b/udev_selinux.c
index b802e1fc6ee36016824db6968129ee0041839e37..77c0e7dc4a3de6ffbf0f695e8b5b08c40f2d4a52 100644
(file)
--- a/
udev_selinux.c
+++ b/
udev_selinux.c
@@
-90,10
+90,12
@@
void selinux_setfilecon(const char *file, const char *devname, unsigned int mode
char *media;
int ret = -1;
char *media;
int ret = -1;
- media = get_media(devname, mode);
- if (media) {
- ret = matchmediacon(media, &scontext);
- free(media);
+ if (devname) {
+ media = get_media(devname, mode);
+ if (media) {
+ ret = matchmediacon(media, &scontext);
+ free(media);
+ }
}
if (ret < 0)
}
if (ret < 0)
@@
-102,7
+104,7
@@
void selinux_setfilecon(const char *file, const char *devname, unsigned int mode
return;
}
return;
}
- if (setfilecon(file, scontext) < 0)
+ if (
l
setfilecon(file, scontext) < 0)
err("setfilecon %s failed: %s", file, strerror(errno));
freecon(scontext);
err("setfilecon %s failed: %s", file, strerror(errno));
freecon(scontext);
@@
-116,10
+118,12
@@
void selinux_setfscreatecon(const char *file, const char *devname, unsigned int
char *media;
int ret = -1;
char *media;
int ret = -1;
- media = get_media(devname, mode);
- if (media) {
- ret = matchmediacon(media, &scontext);
- free(media);
+ if (devname) {
+ media = get_media(devname, mode);
+ if (media) {
+ ret = matchmediacon(media, &scontext);
+ free(media);
+ }
}
if (ret < 0)
}
if (ret < 0)
@@
-150,6
+154,8
@@
void selinux_init(void)
* restoration creation purposes.
*/
if (is_selinux_running()) {
* restoration creation purposes.
*/
if (is_selinux_running()) {
+ if (!udev_root[0])
+ err("selinux_init: udev_root not set\n");
matchpathcon_init_prefix(NULL, udev_root);
if (getfscreatecon(&prev_scontext) < 0) {
err("getfscreatecon failed\n");
matchpathcon_init_prefix(NULL, udev_root);
if (getfscreatecon(&prev_scontext) < 0) {
err("getfscreatecon failed\n");