mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
tools/oxenstored/syslog: Avoid potential NULL dereference
strdup() may return NULL. Check for this before passing to syslog().
Drop const from c_msg. It is bogus, as demonstrated by the need to cast to
void * in order to free the memory.
Signed-off-by: Edwin Török <edvin.torok@citrix.com>
Acked-by: Christian Lindig <christian.lindig@citrix.com>
(cherry picked from commit acd3fb6d65)
This commit is contained in:
1 parent
a41d969353
commit
4a8ff8bf1b
1 file changed
+5
-2
@@ -14,6 +14,7 @@
|
||||
|
||||
#include <syslog.h>
|
||||
#include <string.h>
|
||||
#include <caml/fail.h>
|
||||
#include <caml/mlvalues.h>
|
||||
#include <caml/memory.h>
|
||||
#include <caml/alloc.h>
|
||||
@@ -35,14 +36,16 @@ static int __syslog_facility_table[] = {
|
||||
value stub_syslog(value facility, value level, value msg)
|
||||
{
|
||||
CAMLparam3(facility, level, msg);
|
||||
const char *c_msg = strdup(String_val(msg));
|
||||
char *c_msg = strdup(String_val(msg));
|
||||
int c_facility = __syslog_facility_table[Int_val(facility)]
|
||||
| __syslog_level_table[Int_val(level)];
|
||||
|
||||
if ( !c_msg )
|
||||
caml_raise_out_of_memory();
|
||||
caml_enter_blocking_section();
|
||||
syslog(c_facility, "%s", c_msg);
|
||||
caml_leave_blocking_section();
|
||||
|
||||
free((void*)c_msg);
|
||||
free(c_msg);
|
||||
CAMLreturn(Val_unit);
|
||||
}
|
||||