From: Andreas Schwab <schwab@LS5.informatik.uni-dortmund.de>
Date: Wed, 2 Jul 1997 10:04:38 +0000 (+1200)
Subject: semctl broken under Linux
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=8e591e46b4c6543ed80895327199c4a628ce11b6;p=p5sagit%2Fp5-mst-13.2.git

semctl broken under Linux

semctl(...,[GS]ETALL,...) passes an uninitialized pointer to the syscall.

Credited: Graham Barr <gbarr@ti.com>
Credited: Tim Bunce <Tim.Bunce@ig.co.uk>

p5p-msgid: 9707040912.AA03470@issan.informatik.uni-dortmund.de
private-msgid: 33C38291.2D9302DA@ti.com
---

diff --git a/doio.c b/doio.c
index 62b7de9..f98af9b 100644
--- a/doio.c
+++ b/doio.c
@@ -1364,6 +1364,7 @@ SV **sp;
 	    infosize = sizeof(struct semid_ds);
 	else if (cmd == GETALL || cmd == SETALL)
 	{
+	    struct semid_ds semds;
 #ifdef __linux__	/* XXX Need metaconfig test */
 /* linux uses :
    int semctl (int semid, int semnun, int cmd, union semun arg)
@@ -1374,19 +1375,14 @@ SV **sp;
             ushort *array;
        };
 */
-            union semun semds;
-	    if (semctl(id, 0, IPC_STAT, semds) == -1)
+	    unsemds.buf = &semds;
+	    if (semctl(id, 0, IPC_STAT, unsemds) == -1)
 #else
-	    struct semid_ds semds;
 	    if (semctl(id, 0, IPC_STAT, &semds) == -1)
 #endif
 		return -1;
 	    getinfo = (cmd == GETALL);
-#ifdef __linux__	/* XXX Need metaconfig test */
-	    infosize = semds.buf->sem_nsems * sizeof(short);
-#else
 	    infosize = semds.sem_nsems * sizeof(short);
-#endif
 		/* "short" is technically wrong but much more portable
 		   than guessing about u_?short(_t)? */
 	}