From: Daniel P. Berrange Date: Fri, 2 Aug 2013 11:15:15 +0000 (+0100) Subject: Ensure LXC/QEMU APIs set the filename for errors X-Git-Tag: CVE-2013-4239~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb3868f701bda3e3f71f9161b4a7f19106600fa6;p=thirdparty%2Flibvirt.git Ensure LXC/QEMU APIs set the filename for errors The virLibConnError macros in libvirt-lxc.c and libvirt-qemu.c were passing NULL for the filename. This causes a crash if the logging code is configured to use journald. Signed-off-by: Daniel P. Berrange --- diff --git a/src/libvirt-lxc.c b/src/libvirt-lxc.c index da69dce879..c8cdcea70e 100644 --- a/src/libvirt-lxc.c +++ b/src/libvirt-lxc.c @@ -35,12 +35,12 @@ #define VIR_FROM_THIS VIR_FROM_NONE -#define virLibConnError(conn, error, info) \ - virReportErrorHelper(VIR_FROM_NONE, error, NULL, __FUNCTION__, \ +#define virLibConnError(conn, error, info) \ + virReportErrorHelper(VIR_FROM_NONE, error, __FILE__, __FUNCTION__, \ __LINE__, info) #define virLibDomainError(domain, error, info) \ - virReportErrorHelper(VIR_FROM_DOM, error, NULL, __FUNCTION__, \ + virReportErrorHelper(VIR_FROM_DOM, error, __FILE__, __FUNCTION__, \ __LINE__, info) /** diff --git a/src/libvirt-qemu.c b/src/libvirt-qemu.c index 2a1432b862..83fb3b3ab4 100644 --- a/src/libvirt-qemu.c +++ b/src/libvirt-qemu.c @@ -29,12 +29,12 @@ #define VIR_FROM_THIS VIR_FROM_NONE -#define virLibConnError(conn, error, info) \ - virReportErrorHelper(VIR_FROM_NONE, error, NULL, __FUNCTION__, \ +#define virLibConnError(conn, error, info) \ + virReportErrorHelper(VIR_FROM_NONE, error, __FILE__, __FUNCTION__, \ __LINE__, info) #define virLibDomainError(domain, error, info) \ - virReportErrorHelper(VIR_FROM_DOM, error, NULL, __FUNCTION__, \ + virReportErrorHelper(VIR_FROM_DOM, error, __FILE__, __FUNCTION__, \ __LINE__, info) /**