Util-Linux package development
 help / color / mirror / Atom feed
* [PATCH] lsipc: don't free shm data if no shm id is found
@ 2016-03-22 21:19 Romain Naour
  2016-03-23 10:08 ` Karel Zak
  0 siblings, 1 reply; 2+ messages in thread
From: Romain Naour @ 2016-03-22 21:19 UTC (permalink / raw)
  To: util-linux; +Cc: Romain Naour

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 <romain.naour@gmail.com>
---
 sys-utils/lsipc.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sys-utils/lsipc.c b/sys-utils/lsipc.c
index 938728a..195ee15 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[])
-- 
2.5.0


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-03-23 10:08 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-22 21:19 [PATCH] lsipc: don't free shm data if no shm id is found Romain Naour
2016-03-23 10:08 ` Karel Zak

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox