From: Romain Naour Date: Tue, 22 Mar 2016 21:19:54 +0000 (+0100) Subject: lsipc: don't free shm data if no shm id is found X-Git-Tag: v2.28-rc2~6 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90a9b9910cb7800f1bd4981b19f34d220393ff2c;p=thirdparty%2Futil-linux.git lsipc: don't free shm data if no shm id is found There is a segfault in do_shm_global() when ipc_shm_get_info() return 0 and ipc_shm_free_info() is called. When no shm id is found, the memory allocated in shmds by ipc_shm_get_info() is already free when ipc_shm_free_info() is called. Move ipc_shm_free_info(shmds) inside the if statement where at least one shm id is found. Signed-off-by: Romain Naour --- diff --git a/sys-utils/lsipc.c b/sys-utils/lsipc.c index 938728ada0..195ee15de8 100644 --- a/sys-utils/lsipc.c +++ b/sys-utils/lsipc.c @@ -1071,14 +1071,13 @@ static void do_shm_global(struct libscols_table *tb) ++nsegs; sum_segsz += shmdsp->shm_segsz; } + ipc_shm_free_info(shmds); } global_set_data(tb, "SHMMNI", _("Shared memory segments"), nsegs, lim.shmmni, 1); global_set_data(tb, "SHMALL", _("Shared memory pages"), sum_segsz / getpagesize(), lim.shmall, 1); global_set_data(tb, "SHMMAX", _("Max size of shared memory segment (bytes)"), 0, lim.shmmax, 0); global_set_data(tb, "SHMMIN", _("Min size of shared memory segment (bytes)"), 0, lim.shmmin, 0); - - ipc_shm_free_info(shmds); } int main(int argc, char *argv[])