External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

conf: Fix invalid condition when parsing storage owner

Browse Source 
In commit d2632d60 we agreed taht we want the parsed uid to properly
overflow but only to -1, however the value was read into long and then
wrapped into uid_t.  That meaned it failed on 32-bit systems.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Martin Kletzander 2014-12-16 17:38:59 +01:00
parent 18f03166fd
commit 57c008f860
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/conf/storage_conf.c
View File

@ -734,7 +734,7 @@ virStorageDefParsePerms(xmlXPathContextPtr ctxt,
int defaultmode) int defaultmode)
{ {
char *mode; char *mode;
long val; long long val;
int ret = -1; int ret = -1;
xmlNodePtr relnode; xmlNodePtr relnode;
xmlNodePtr node; xmlNodePtr node;
@ -771,7 +771,7 @@ virStorageDefParsePerms(xmlXPathContextPtr ctxt,
if (virXPathNode("./owner", ctxt) == NULL) { if (virXPathNode("./owner", ctxt) == NULL) {
perms->uid = (uid_t) -1; perms->uid = (uid_t) -1;
} else { } else {
if (virXPathLong("number(./owner)", ctxt, &val) < 0 || if (virXPathLongLong("number(./owner)", ctxt, &val) < 0 ||
((uid_t)val != val && ((uid_t)val != val &&
val != -1)) { val != -1)) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
@ -785,7 +785,7 @@ virStorageDefParsePerms(xmlXPathContextPtr ctxt,
if (virXPathNode("./group", ctxt) == NULL) { if (virXPathNode("./group", ctxt) == NULL) {
perms->gid = (gid_t) -1; perms->gid = (gid_t) -1;
} else { } else {
if (virXPathLong("number(./group)", ctxt, &val) < 0 || if (virXPathLongLong("number(./group)", ctxt, &val) < 0 ||
((gid_t) val != val && ((gid_t) val != val &&
val != -1)) { val != -1)) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",