package/util-linux: fix lsipc segfault
PATCH 1/1 package/util-linux: fix lsipc segfault
lsipc segfault when no option is given.
Signed-off-by Romain Naour <[email protected]>
--- ...don-t-free-shm-data-if-no-shm-id-is-found.patch | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 package/util-linux/0008-lsipc-don-t-free-shm-data-if-no-shm-id-is-found.patch
package/util-linux/0008-lsipc-don-t-free-shm-data-if-no-shm-id-is-found.patch new file +42 -0
@@ -0,0 +1,42 @@ +From cb8e8ecc800a1a8536fe5507ae7d09a8c1c442a8 Mon Sep 17 00:00:00 2001 +From: Romain Naour <[email protected]> +Date: Tue, 22 Mar 2016 11:25:09 +0100 +Subject: [PATCH] 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 <[email protected]> +--- + 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 523859c..fa5d99c 100644 +--- a/sys-utils/lsipc.c ++++ b/sys-utils/lsipc.c +@@ -1072,14 +1072,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.1.4 +
Signature · 1 line
2.5.0
Thomas Petazzoni
AppliedPATCH 1/1 package/util-linux: fix lsipc segfault
Hello,
Quoted 7 lines · Romain Naour
lsipc segfault when no option is given.
Signed-off-by Romain Naour <[email protected]>--- ...don-t-free-shm-data-if-no-shm-id-is-found.patch | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 package/util-linux/0008-lsipc-don-t-free-shm-data-if-no-shm-id-is-found.patch
Applied to master, thanks. Please submit upstream, of course.
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 1/1 package/util-linux: fix lsipc segfault
Hello, Thomas,
Le 22/03/2016 22:36, Thomas Petazzoni a ?crit :
Quoted 5 lines
Hello,
Quoted 2 lines · Romain Naour
lsipc segfault when no option is given.
Quoted 7 lines
Quoted 5 lines
Signed-off-by Romain Naour <[email protected]>--- ...don-t-free-shm-data-if-no-shm-id-is-found.patch | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 package/util-linux/0008-lsipc-don-t-free-shm-data-if-no-shm-id-is-found.patchApplied to master, thanks. Please submit upstream, of course.
Done:
http://marc.info/?l=util-linux-ng&m=145868160106644&w=2
Best regards,
Romain
Quoted 5 lines
Thanks,
Thomas