o Merge with Linux 2.1.100.

 o Cleanup the machine dependencies of floppy and rtc.  The driver for
   the Dallas thingy in the Indy is still missing.
 o Handle allocation of zero'd pages correct for R4000SC / R4400SC.
 o Page colouring shit to match the virtual and physical colour of all
   mapped pages.  This tends to produce extreme fragmentation problems,
   so it's deactivated for now.  Users of R4000SC / R4400SC may re-enable
   the code in arch/mips/mm/init.c by removing the definition of
   CONF_GIVE_A_SHIT_ABOUT_COLOURS.  Should get them somewhat further -
   but don't shake to hard ...
 o Fixed ptrace(2)-ing of syscalls, strace is now working again.
 o Fix the interrupt forwarding from the keyboard driver to the psaux
   driver, PS/2 mice are now working on the Indy.  The fix is somewhat
   broken as it prevents generic kernels for Indy and machines which handle
   things different.
 o Things I can't remember.

4 files changed, 17 insertions, 10 deletions

diff --git a/ipc/msg.c b/ipc/msg.c
index 30fe31239..e505bcc01 100644
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -477,9 +477,10 @@ asmlinkage int sys_msgctl (int msqid, int cmd, struct msqid_ds *buf)
 	case IPC_SET:
 		err = -EPERM;
 		if (current->euid != ipcp->cuid && 
-		    current->euid != ipcp->uid && !suser())
+		    current->euid != ipcp->uid && !capable(CAP_SYS_ADMIN))
+		    /* We _could_ check for CAP_CHOWN above, but we don't */
 			goto out;
-		if (tbuf.msg_qbytes > MSGMNB && !suser())
+		if (tbuf.msg_qbytes > MSGMNB && !capable(CAP_SYS_RESOURCE))
 			goto out;
 		msq->msg_qbytes = tbuf.msg_qbytes;
 		ipcp->uid = tbuf.msg_perm.uid;
@@ -492,7 +493,7 @@ asmlinkage int sys_msgctl (int msqid, int cmd, struct msqid_ds *buf)
 	case IPC_RMID:
 		err = -EPERM;
 		if (current->euid != ipcp->cuid && 
-		    current->euid != ipcp->uid && !suser())
+		    current->euid != ipcp->uid && !capable(CAP_SYS_ADMIN))
 			goto out;
 
 		freeque (id); 
diff --git a/ipc/sem.c b/ipc/sem.c
index 8e5be61d2..0ab578584 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -482,7 +482,8 @@ asmlinkage int sys_semctl (int semid, int semnum, int cmd, union semun arg)
 			goto out;
 		break;
 	case IPC_RMID:
-		if (current->euid == ipcp->cuid || current->euid == ipcp->uid || suser()) {
+		if (current->euid == ipcp->cuid || 
+		    current->euid == ipcp->uid || capable(CAP_SYS_ADMIN)) {
 			freeary (id);
 			err = 0;
 			goto out;
@@ -540,7 +541,8 @@ asmlinkage int sys_semctl (int semid, int semnum, int cmd, union semun arg)
 		update_queue(sma);
 		break;
 	case IPC_SET:
-		if (current->euid == ipcp->cuid || current->euid == ipcp->uid || suser()) {
+		if (current->euid == ipcp->cuid || 
+		    current->euid == ipcp->uid || capable(CAP_SYS_ADMIN)) {
 			ipcp->uid = tbuf.sem_perm.uid;
 			ipcp->gid = tbuf.sem_perm.gid;
 			ipcp->mode = (ipcp->mode & ~S_IRWXUGO)
diff --git a/ipc/shm.c b/ipc/shm.c
index 09b69c4a3..0962be882 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -306,7 +306,7 @@ asmlinkage int sys_shmctl (int shmid, int cmd, struct shmid_ds *buf)
 	switch (cmd) {
 	case SHM_UNLOCK:
 		err = -EPERM;
-		if (!suser())
+		if (!capable(CAP_IPC_LOCK))
 			goto out;
 		err = -EINVAL;
 		if (!(ipcp->mode & SHM_LOCKED))
@@ -318,7 +318,7 @@ asmlinkage int sys_shmctl (int shmid, int cmd, struct shmid_ds *buf)
 /* Should the pages be faulted in here or leave it to user? */
 /* need to determine interaction with current->swappable */
 		err = -EPERM;
-		if (!suser())
+		if (!capable(CAP_IPC_LOCK))
 			goto out;
 		err = -EINVAL;
 		if (ipcp->mode & SHM_LOCKED)
@@ -347,7 +347,8 @@ asmlinkage int sys_shmctl (int shmid, int cmd, struct shmid_ds *buf)
 		break;
 	case IPC_SET:
 		if (current->euid == shp->shm_perm.uid ||
-		    current->euid == shp->shm_perm.cuid || suser()) {
+		    current->euid == shp->shm_perm.cuid || 
+		    capable(CAP_SYS_ADMIN)) {
 			ipcp->uid = tbuf.shm_perm.uid;
 			ipcp->gid = tbuf.shm_perm.gid;
 			ipcp->mode = (ipcp->mode & ~S_IRWXUGO)
@@ -359,7 +360,8 @@ asmlinkage int sys_shmctl (int shmid, int cmd, struct shmid_ds *buf)
 		goto out;
 	case IPC_RMID:
 		if (current->euid == shp->shm_perm.uid ||
-		    current->euid == shp->shm_perm.cuid || suser()) {
+		    current->euid == shp->shm_perm.cuid || 
+		    capable(CAP_SYS_ADMIN)) {
 			shp->shm_perm.mode |= SHM_DEST;
 			if (shp->shm_nattch <= 0)
 				killseg (id);
diff --git a/ipc/util.c b/ipc/util.c
index eacea2b62..fe13f8676 100644
--- a/ipc/util.c
+++ b/ipc/util.c
@@ -47,8 +47,10 @@ int ipcperms (struct ipc_perm *ipcp, short flag)
 	else if (in_group_p(ipcp->cgid) || in_group_p(ipcp->gid))
 		granted_mode >>= 3;
 	/* is there some bit set in requested_mode but not in granted_mode? */
-	if ((requested_mode & ~granted_mode & 0007) && !suser())
+	if ((requested_mode & ~granted_mode & 0007) && 
+	    !capable(CAP_IPC_OWNER))
 		return -1;
+
 	return 0;
 }