提交 89921f54 编写于 作者: M Michal Privoznik

qemuDomainCreateDeviceRecursive: Fail on unsupported file type

Currently, we silently assume that file we are creating in the
namespace is either a link or a device (character or block one).
This is not always the case. Therefore instead of doing something
wrong, claim about unsupported file type.
Signed-off-by: NMichal Privoznik <mprivozn@redhat.com>
Reviewed-by: NJohn Ferlan <jferlan@redhat.com>
上级 4d8a914b
...@@ -7720,6 +7720,7 @@ qemuDomainCreateDeviceRecursive(const char *device, ...@@ -7720,6 +7720,7 @@ qemuDomainCreateDeviceRecursive(const char *device,
struct stat sb; struct stat sb;
int ret = -1; int ret = -1;
bool isLink = false; bool isLink = false;
bool isDev = false;
bool create = false; bool create = false;
#ifdef WITH_SELINUX #ifdef WITH_SELINUX
char *tcon = NULL; char *tcon = NULL;
...@@ -7742,6 +7743,7 @@ qemuDomainCreateDeviceRecursive(const char *device, ...@@ -7742,6 +7743,7 @@ qemuDomainCreateDeviceRecursive(const char *device,
} }
isLink = S_ISLNK(sb.st_mode); isLink = S_ISLNK(sb.st_mode);
isDev = S_ISCHR(sb.st_mode) || S_ISBLK(sb.st_mode);
/* Here, @device might be whatever path in the system. We /* Here, @device might be whatever path in the system. We
* should create the path in the namespace iff it's "/dev" * should create the path in the namespace iff it's "/dev"
...@@ -7841,7 +7843,7 @@ qemuDomainCreateDeviceRecursive(const char *device, ...@@ -7841,7 +7843,7 @@ qemuDomainCreateDeviceRecursive(const char *device,
if (qemuDomainCreateDeviceRecursive(target, data, if (qemuDomainCreateDeviceRecursive(target, data,
allow_noent, ttl - 1) < 0) allow_noent, ttl - 1) < 0)
goto cleanup; goto cleanup;
} else { } else if (isDev) {
if (create && if (create &&
mknod(devicePath, sb.st_mode, sb.st_rdev) < 0) { mknod(devicePath, sb.st_mode, sb.st_rdev) < 0) {
if (errno == EEXIST) { if (errno == EEXIST) {
...@@ -7863,6 +7865,11 @@ qemuDomainCreateDeviceRecursive(const char *device, ...@@ -7863,6 +7865,11 @@ qemuDomainCreateDeviceRecursive(const char *device,
devicePath); devicePath);
goto cleanup; goto cleanup;
} }
} else {
virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
_("unsupported device type %s 0%o"),
device, sb.st_mode);
goto cleanup;
} }
if (!create) { if (!create) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册