Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1eb1332 authored by Jiri Slaby's avatar Jiri Slaby Committed by Linus Torvalds
Browse files

ipc: use rlimit helpers 



Make sure compiler won't do weird things with limits.  E.g.  fetching them
twice may return 2 different values after writable limits are implemented.

I.e.  either use rlimit helpers added in
3e10e716 ("resource: add helpers for
fetching rlimits") or ACCESS_ONCE if not applicable.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d6db2ade

ipc/mqueue.c

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb, 
			spin_lock(&mq_lock);

			if (u->mq_bytes + mq_bytes < u->mq_bytes ||

		 	    u->mq_bytes + mq_bytes >

			    p->signal->rlim[RLIMIT_MSGQUEUE].rlim_cur) {

			    task_rlimit(p, RLIMIT_MSGQUEUE)) {

				spin_unlock(&mq_lock);

				kfree(info->messages);

				goto out_inode;

ipc/shm.c

+1 −2
Original line number Diff line number Diff line
@@ -764,8 +764,7 @@ SYSCALL_DEFINE3(shmctl, int, shmid, int, cmd, struct shmid_ds __user *, buf) 
			if (euid != shp->shm_perm.uid &&

			    euid != shp->shm_perm.cuid)

				goto out_unlock;

			if (cmd == SHM_LOCK &&

			    !current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur)

			if (cmd == SHM_LOCK && !rlimit(RLIMIT_MEMLOCK))

				goto out_unlock;

		}