[libvirt] [PATCH] Avoid calling virStorageFileIsSharedFS with NULL

Daniel Veillard veillard at redhat.com
Tue Jun 29 08:41:26 UTC 2010


On Mon, Jun 28, 2010 at 11:58:43PM -0400, Laine Stump wrote:
>  On 06/28/2010 11:54 PM, Laine Stump wrote:
> >From: Laine Stump<laine at redhat.com>
> >
> >This code was just recently added (by me) and didn't account for the
> >fact that stdin_path is sometimes NULL. If it's NULL, and
> >SetSecurityAllLabel fails, a segfault would result.
> >---
> >  src/qemu/qemu_driver.c |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> >
> >diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
> >index 2a277a5..e8c5c35 100644
> >--- a/src/qemu/qemu_driver.c
> >+++ b/src/qemu/qemu_driver.c
> >@@ -3429,7 +3429,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
> >      if (driver->securityDriver&&
> >          driver->securityDriver->domainSetSecurityAllLabel&&
> >          driver->securityDriver->domainSetSecurityAllLabel(vm, stdin_path)<  0) {
> >-        if (virStorageFileIsSharedFS(stdin_path) != 1)
> >+        if (stdin_path&&  virStorageFileIsSharedFS(stdin_path) != 1)
> >              goto cleanup;
> >      }
> >
> 
> Because this is a trivial and obvious fix, and I didn't want anyone
> else to hit the segfault, I just pushed it.

  ACK anyway :-)

Daniel

-- 
Daniel Veillard      | libxml Gnome XML XSLT toolkit  http://xmlsoft.org/
daniel at veillard.com  | Rpmfind RPM search engine http://rpmfind.net/
http://veillard.com/ | virtualization library  http://libvirt.org/




More information about the libvir-list mailing list