4 files changed, 58 insertions, 50 deletions

diff --git a/ipc/msg.c b/ipc/msg.c
index a7261d5cbc89..2b6fdbb9e0e9 100644
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -1015,22 +1015,24 @@ static int sysvipc_msg_proc_show(struct seq_file *s, void *it)
         struct user_namespace *user_ns = seq_user_ns(s);
         struct msg_queue *msq = it;
 
-        return seq_printf(s,
-                        "%10d %10d  %4o  %10lu %10lu %5u %5u %5u %5u %5u %5u %10lu %10lu %10lu\n",
-                        msq->q_perm.key,
-                        msq->q_perm.id,
-                        msq->q_perm.mode,
-                        msq->q_cbytes,
-                        msq->q_qnum,
-                        msq->q_lspid,
-                        msq->q_lrpid,
-                        from_kuid_munged(user_ns, msq->q_perm.uid),
-                        from_kgid_munged(user_ns, msq->q_perm.gid),
-                        from_kuid_munged(user_ns, msq->q_perm.cuid),
-                        from_kgid_munged(user_ns, msq->q_perm.cgid),
-                        msq->q_stime,
-                        msq->q_rtime,
-                        msq->q_ctime);
+        seq_printf(s,
+                   "%10d %10d  %4o  %10lu %10lu %5u %5u %5u %5u %5u %5u %10lu %10lu %10lu\n",
+                   msq->q_perm.key,
+                   msq->q_perm.id,
+                   msq->q_perm.mode,
+                   msq->q_cbytes,
+                   msq->q_qnum,
+                   msq->q_lspid,
+                   msq->q_lrpid,
+                   from_kuid_munged(user_ns, msq->q_perm.uid),
+                   from_kgid_munged(user_ns, msq->q_perm.gid),
+                   from_kuid_munged(user_ns, msq->q_perm.cuid),
+                   from_kgid_munged(user_ns, msq->q_perm.cgid),
+                   msq->q_stime,
+                   msq->q_rtime,
+                   msq->q_ctime);
+
+        return 0;
 }
 #endif
 
diff --git a/ipc/sem.c b/ipc/sem.c
index 92842113c6a9..d1a6edd17eba 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -2170,17 +2170,19 @@ static int sysvipc_sem_proc_show(struct seq_file *s, void *it)
 
         sem_otime = get_semotime(sma);
 
-        return seq_printf(s,
-                          "%10d %10d  %4o %10u %5u %5u %5u %5u %10lu %10lu\n",
-                          sma->sem_perm.key,
-                          sma->sem_perm.id,
-                          sma->sem_perm.mode,
-                          sma->sem_nsems,
-                          from_kuid_munged(user_ns, sma->sem_perm.uid),
-                          from_kgid_munged(user_ns, sma->sem_perm.gid),
-                          from_kuid_munged(user_ns, sma->sem_perm.cuid),
-                          from_kgid_munged(user_ns, sma->sem_perm.cgid),
-                          sem_otime,
-                          sma->sem_ctime);
+        seq_printf(s,
+                   "%10d %10d  %4o %10u %5u %5u %5u %5u %10lu %10lu\n",
+                   sma->sem_perm.key,
+                   sma->sem_perm.id,
+                   sma->sem_perm.mode,
+                   sma->sem_nsems,
+                   from_kuid_munged(user_ns, sma->sem_perm.uid),
+                   from_kgid_munged(user_ns, sma->sem_perm.gid),
+                   from_kuid_munged(user_ns, sma->sem_perm.cuid),
+                   from_kgid_munged(user_ns, sma->sem_perm.cgid),
+                   sem_otime,
+                   sma->sem_ctime);
+
+        return 0;
 }
 #endif
diff --git a/ipc/shm.c b/ipc/shm.c
index 19633b4a2350..d280a74af2ef 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -1342,25 +1342,27 @@ static int sysvipc_shm_proc_show(struct seq_file *s, void *it)
 #define SIZE_SPEC "%21lu"
 #endif
 
-        return seq_printf(s,
-                          "%10d %10d  %4o " SIZE_SPEC " %5u %5u  "
-                          "%5lu %5u %5u %5u %5u %10lu %10lu %10lu "
-                          SIZE_SPEC " " SIZE_SPEC "\n",
-                          shp->shm_perm.key,
-                          shp->shm_perm.id,
-                          shp->shm_perm.mode,
-                          shp->shm_segsz,
-                          shp->shm_cprid,
-                          shp->shm_lprid,
-                          shp->shm_nattch,
-                          from_kuid_munged(user_ns, shp->shm_perm.uid),
-                          from_kgid_munged(user_ns, shp->shm_perm.gid),
-                          from_kuid_munged(user_ns, shp->shm_perm.cuid),
-                          from_kgid_munged(user_ns, shp->shm_perm.cgid),
-                          shp->shm_atim,
-                          shp->shm_dtim,
-                          shp->shm_ctim,
-                          rss * PAGE_SIZE,
-                          swp * PAGE_SIZE);
+        seq_printf(s,
+                   "%10d %10d  %4o " SIZE_SPEC " %5u %5u  "
+                   "%5lu %5u %5u %5u %5u %10lu %10lu %10lu "
+                   SIZE_SPEC " " SIZE_SPEC "\n",
+                   shp->shm_perm.key,
+                   shp->shm_perm.id,
+                   shp->shm_perm.mode,
+                   shp->shm_segsz,
+                   shp->shm_cprid,
+                   shp->shm_lprid,
+                   shp->shm_nattch,
+                   from_kuid_munged(user_ns, shp->shm_perm.uid),
+                   from_kgid_munged(user_ns, shp->shm_perm.gid),
+                   from_kuid_munged(user_ns, shp->shm_perm.cuid),
+                   from_kgid_munged(user_ns, shp->shm_perm.cgid),
+                   shp->shm_atim,
+                   shp->shm_dtim,
+                   shp->shm_ctim,
+                   rss * PAGE_SIZE,
+                   swp * PAGE_SIZE);
+
+        return 0;
 }
 #endif
diff --git a/ipc/util.c b/ipc/util.c
index 106bed0378ab..ff3323ef8d8b 100644
--- a/ipc/util.c
+++ b/ipc/util.c
@@ -837,8 +837,10 @@ static int sysvipc_proc_show(struct seq_file *s, void *it)
         struct ipc_proc_iter *iter = s->private;
         struct ipc_proc_iface *iface = iter->iface;
 
-        if (it == SEQ_START_TOKEN)
-                return seq_puts(s, iface->header);
+        if (it == SEQ_START_TOKEN) {
+                seq_puts(s, iface->header);
+                return 0;
+        }
 
         return iface->show(s, it);
 }