ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <romain.naour@gmail.com>
This commit is contained in:
Romain Naour 2016-03-22 22:19:54 +01:00 committed by Karel Zak
parent 7ce27dc517
commit 90a9b9910c
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys-utils/lsipc.c
View File

@ -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[])