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

Commit ccbe9f0b authored by Jiri Slaby's avatar Jiri Slaby Committed by Roland Dreier
Browse files

RDMA: Use rlimit helpers 



Make sure compiler won't do weird things with limits by using the
rlimit helpers added in 3e10e716 ("resource: add helpers for fetching
rlimits").  E.g. fetching them twice may return 2 different values
after writable limits are implemented.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 676ad585

drivers/infiniband/core/umem.c

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, 
	down_write(&current->mm->mmap_sem);



	locked     = npages + current->mm->locked_vm;

	lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur >> PAGE_SHIFT;

	lock_limit = rlimit(RLIMIT_MEMLOCK) >> PAGE_SHIFT;



	if ((locked > lock_limit) && !capable(CAP_IPC_LOCK)) {

		ret = -ENOMEM;

drivers/infiniband/hw/ipath/ipath_user_pages.c

+1 −2
Original line number Diff line number Diff line
@@ -59,8 +59,7 @@ static int __get_user_pages(unsigned long start_page, size_t num_pages, 
	size_t got;

	int ret;



	lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur >>

		PAGE_SHIFT;

	lock_limit = rlimit(RLIMIT_MEMLOCK) >> PAGE_SHIFT;



	if (num_pages > lock_limit) {

		ret = -ENOMEM;