External/libvirt
1
0
Fork 0
Code

conf: Fix possible NULL dereference in virStorageVolTargetDefFormat

Browse Source 
Commit dae1568c6c6455091e8cd9bc2e90a22af3d3880c converted the perms
member of the virStorageVolTarget struct into a pointer to make it
optional. But virStorageVolTargetDefFormat did not check perms for
NULL before dereferencing it.
This commit is contained in:
Matthias Bolte 2014-07-11 18:13:34 +02:00 committed by Eric Blake
parent 9b1e4cd503
commit 270969c4dd
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/conf/storage_conf.c
View File

@ -1423,22 +1423,24 @@ virStorageVolTargetDefFormat(virStorageVolOptionsPtr options,
virBufferAsprintf(buf, "<format type='%s'/>\n", format); virBufferAsprintf(buf, "<format type='%s'/>\n", format);
} }
virBufferAddLit(buf, "<permissions>\n"); if (def->perms) {
virBufferAdjustIndent(buf, 2); virBufferAddLit(buf, "<permissions>\n");
virBufferAdjustIndent(buf, 2);
virBufferAsprintf(buf, "<mode>0%o</mode>\n", virBufferAsprintf(buf, "<mode>0%o</mode>\n",
def->perms->mode); def->perms->mode);
virBufferAsprintf(buf, "<owner>%u</owner>\n", virBufferAsprintf(buf, "<owner>%u</owner>\n",
(unsigned int) def->perms->uid); (unsigned int) def->perms->uid);
virBufferAsprintf(buf, "<group>%u</group>\n", virBufferAsprintf(buf, "<group>%u</group>\n",
(unsigned int) def->perms->gid); (unsigned int) def->perms->gid);
virBufferEscapeString(buf, "<label>%s</label>\n", virBufferEscapeString(buf, "<label>%s</label>\n",
def->perms->label); def->perms->label);
virBufferAdjustIndent(buf, -2); virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</permissions>\n"); virBufferAddLit(buf, "</permissions>\n");
}
if (def->timestamps) { if (def->timestamps) {
virBufferAddLit(buf, "<timestamps>\n"); virBufferAddLit(buf, "<timestamps>\n");