From 9441dd7ad0e1b1d77c9ba44ad4fdceda0bc44e58 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Mon, 7 Jul 2014 10:36:26 -0700 Subject: [PATCH] pick --- meta | 5 +++-- patches/ibacm-define-prov_lib_path-as- | 30 ++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 patches/ibacm-define-prov_lib_path-as- diff --git a/meta b/meta index d6c0d2a..7555768 100644 --- a/meta +++ b/meta @@ -1,7 +1,8 @@ Version: 1 -Previous: 006e6e9b9382a2a3923bdabf3d9c6afdd00d123a -Head: b7cbaac6cadd778140a20b161f7c29772fc5a77f +Previous: d35659a7bf5b68c60a8650596150c80ef3bf91e0 +Head: ee4fedbe8a2cccd0d550a3936ca2655ecb657243 Applied: + ibacm-define-prov_lib_path-as-: ee4fedbe8a2cccd0d550a3936ca2655ecb657243 Unapplied: suse: 7076e2a00570a3cda4e4ce034419399a23ebfb0a dev-name2ip: 8e00708e882239292492e13aa51c82042255933c diff --git a/patches/ibacm-define-prov_lib_path-as- b/patches/ibacm-define-prov_lib_path-as- new file mode 100644 index 0000000..ef13380 --- /dev/null +++ b/patches/ibacm-define-prov_lib_path-as- @@ -0,0 +1,30 @@ +Bottom: 35fd60e5ad8d8c58e2774173414af34ecd73c204 +Top: 0c45574395afa9ff24d6468cfce3f34b57af4525 +Author: Kaike Wan +Date: 2014-07-07 10:36:25 -0700 + +ibacm: define prov_lib_path as a char array + +This patch fixes a segfault error when the option file defines the provider +lib path. The variable prov_lib_path should be a buffer (char array) instead +of a char pointer. This allows a string to be copied into it during option +parsing. + +Signed-off-by: Kaike Wan + + +--- + +diff --git a/src/acm.c b/src/acm.c +index 8f147ef..fae9d0b 100644 +--- a/src/acm.c ++++ b/src/acm.c +@@ -193,7 +193,7 @@ static int log_level = 0; + static char lock_file[128] = "/var/run/ibacm.pid"; + static short server_port = 6125; + static int support_ips_in_addr_cfg = 0; +-static char *prov_lib_path = IBACM_LIB_PATH; ++static char prov_lib_path[256] = IBACM_LIB_PATH; + + void acm_write(int level, const char *format, ...) + { -- 2.46.0