From: Ruediger Meier Date: Fri, 18 Mar 2016 11:49:18 +0000 (+0100) Subject: ipcs: --shmems, upward/backward compatibility X-Git-Tag: v2.28-rc2~20 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=73f4f3d925d3dfb0c2f2b3246bceb5f6bfb5fa20;p=thirdparty%2Futil-linux.git ipcs: --shmems, upward/backward compatibility Re-add backward compatibility which got lost in 058e8154. Initializing unknown struct members to 0xdead is similar to the fallback. For upward compatibility ignore columns > 16 but not the whole line (in case the kernel would add more columns in future). Reported-by: Benno Schulenberg Signed-off-by: Ruediger Meier --- diff --git a/sys-utils/ipcutils.c b/sys-utils/ipcutils.c index c763cde696..349e8550ed 100644 --- a/sys-utils/ipcutils.c +++ b/sys-utils/ipcutils.c @@ -113,6 +113,9 @@ int ipc_shm_get_info(int id, struct shm_data **shmds) while (fgetc(f) != '\n'); /* skip header */ while (fgets(buf, sizeof(buf), f) != NULL) { + /* scan for the first 14-16 columns (e.g. Linux 2.6.32 has 14) */ + p->shm_rss = 0xdead; + p->shm_swp = 0xdead; if (sscanf(buf, "%d %d %o %"SCNu64 " %u %u " "%"SCNu64 " %u %u %u %u %"SCNi64 " %"SCNi64 " %"SCNi64 @@ -132,7 +135,7 @@ int ipc_shm_get_info(int id, struct shm_data **shmds) &p->shm_dtim, &p->shm_ctim, &p->shm_rss, - &p->shm_swp) != 16) + &p->shm_swp) < 14) continue; /* ivalid line, skipped */ if (id > -1) {