Commit 0839c537 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "15 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  linux/kernel.h: fix overflow for DIV_ROUND_UP_ULL
  mm, swap: fix THP swap out
  fork,memcg: alloc_thread_stack_node needs to set tsk->stack
  MAINTAINERS: add CLANG/LLVM BUILD SUPPORT info
  mm/vmalloc.c: avoid bogus -Wmaybe-uninitialized warning
  mm/page_idle.c: fix oops because end_pfn is larger than max_pfn
  initramfs: fix populate_initrd_image() section mismatch
  mm/oom_kill.c: fix uninitialized oc->constraint
  mm: hugetlb: soft-offline: dissolve_free_huge_page() return zero on !PageHuge
  mm: soft-offline: return -EBUSY if set_hwpoison_free_buddy_page() fails
  signal: remove the wrong signal_pending() check in restore_user_sigmask()
  fs/binfmt_flat.c: make load_flat_shared_library() work
  mm/mempolicy.c: fix an incorrect rebind node in mpol_rebind_nodemask
  fs/proc/array.c: allow reporting eip/esp for all coredumping threads
  mm/dev_pfn: exclude MEMORY_DEVICE_PRIVATE while computing virtual address
parents f8b5c722 8f9fab48

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -3942,6 +3942,14 @@ M: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com> 
S:	Maintained

F:	.clang-format



CLANG/LLVM BUILD SUPPORT

L:	clang-built-linux@googlegroups.com

W:	https://clangbuiltlinux.github.io/

B:	https://github.com/ClangBuiltLinux/linux/issues

C:	irc://chat.freenode.net/clangbuiltlinux

S:	Supported

K:	\b(?i:clang|llvm)\b



CLEANCACHE API

M:	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

L:	linux-kernel@vger.kernel.org

fs/aio.c

+20 −8
Original line number Diff line number Diff line
@@ -2095,6 +2095,7 @@ SYSCALL_DEFINE6(io_pgetevents, 
	struct __aio_sigset	ksig = { NULL, };

	sigset_t		ksigmask, sigsaved;

	struct timespec64	ts;

	bool interrupted;

	int ret;



	if (timeout && unlikely(get_timespec64(&ts, timeout)))
@@ -2108,8 +2109,10 @@ SYSCALL_DEFINE6(io_pgetevents, 
		return ret;



	ret = do_io_getevents(ctx_id, min_nr, nr, events, timeout ? &ts : NULL);

	restore_user_sigmask(ksig.sigmask, &sigsaved);

	if (signal_pending(current) && !ret)



	interrupted = signal_pending(current);

	restore_user_sigmask(ksig.sigmask, &sigsaved, interrupted);

	if (interrupted && !ret)

		ret = -ERESTARTNOHAND;



	return ret;
@@ -2128,6 +2131,7 @@ SYSCALL_DEFINE6(io_pgetevents_time32, 
	struct __aio_sigset	ksig = { NULL, };

	sigset_t		ksigmask, sigsaved;

	struct timespec64	ts;

	bool interrupted;

	int ret;



	if (timeout && unlikely(get_old_timespec32(&ts, timeout)))
@@ -2142,8 +2146,10 @@ SYSCALL_DEFINE6(io_pgetevents_time32, 
		return ret;



	ret = do_io_getevents(ctx_id, min_nr, nr, events, timeout ? &ts : NULL);

	restore_user_sigmask(ksig.sigmask, &sigsaved);

	if (signal_pending(current) && !ret)



	interrupted = signal_pending(current);

	restore_user_sigmask(ksig.sigmask, &sigsaved, interrupted);

	if (interrupted && !ret)

		ret = -ERESTARTNOHAND;



	return ret;
@@ -2193,6 +2199,7 @@ COMPAT_SYSCALL_DEFINE6(io_pgetevents, 
	struct __compat_aio_sigset ksig = { NULL, };

	sigset_t ksigmask, sigsaved;

	struct timespec64 t;

	bool interrupted;

	int ret;



	if (timeout && get_old_timespec32(&t, timeout))
@@ -2206,8 +2213,10 @@ COMPAT_SYSCALL_DEFINE6(io_pgetevents, 
		return ret;



	ret = do_io_getevents(ctx_id, min_nr, nr, events, timeout ? &t : NULL);

	restore_user_sigmask(ksig.sigmask, &sigsaved);

	if (signal_pending(current) && !ret)



	interrupted = signal_pending(current);

	restore_user_sigmask(ksig.sigmask, &sigsaved, interrupted);

	if (interrupted && !ret)

		ret = -ERESTARTNOHAND;



	return ret;
@@ -2226,6 +2235,7 @@ COMPAT_SYSCALL_DEFINE6(io_pgetevents_time64, 
	struct __compat_aio_sigset ksig = { NULL, };

	sigset_t ksigmask, sigsaved;

	struct timespec64 t;

	bool interrupted;

	int ret;



	if (timeout && get_timespec64(&t, timeout))
@@ -2239,8 +2249,10 @@ COMPAT_SYSCALL_DEFINE6(io_pgetevents_time64, 
		return ret;



	ret = do_io_getevents(ctx_id, min_nr, nr, events, timeout ? &t : NULL);

	restore_user_sigmask(ksig.sigmask, &sigsaved);

	if (signal_pending(current) && !ret)



	interrupted = signal_pending(current);

	restore_user_sigmask(ksig.sigmask, &sigsaved, interrupted);

	if (interrupted && !ret)

		ret = -ERESTARTNOHAND;



	return ret;

fs/binfmt_flat.c

+7 −16
Original line number Diff line number Diff line
@@ -856,9 +856,14 @@ err: 


static int load_flat_shared_library(int id, struct lib_info *libs)

{

	/*

	 * This is a fake bprm struct; only the members "buf", "file" and

	 * "filename" are actually used.

	 */

	struct linux_binprm bprm;

	int res;

	char buf[16];

	loff_t pos = 0;



	memset(&bprm, 0, sizeof(bprm));
@@ -872,25 +877,11 @@ static int load_flat_shared_library(int id, struct lib_info *libs) 
	if (IS_ERR(bprm.file))

		return res;



	bprm.cred = prepare_exec_creds();

	res = -ENOMEM;

	if (!bprm.cred)

		goto out;



	/* We don't really care about recalculating credentials at this point

	 * as we're past the point of no return and are dealing with shared

	 * libraries.

	 */

	bprm.called_set_creds = 1;

	res = kernel_read(bprm.file, bprm.buf, BINPRM_BUF_SIZE, &pos);



	res = prepare_binprm(&bprm);



	if (!res)

	if (res >= 0)

		res = load_flat_file(&bprm, libs, id, NULL);



	abort_creds(bprm.cred);



out:

	allow_write_access(bprm.file);

	fput(bprm.file);

fs/eventpoll.c

+2 −2
Original line number Diff line number Diff line
@@ -2325,7 +2325,7 @@ SYSCALL_DEFINE6(epoll_pwait, int, epfd, struct epoll_event __user *, events, 


	error = do_epoll_wait(epfd, events, maxevents, timeout);



	restore_user_sigmask(sigmask, &sigsaved);

	restore_user_sigmask(sigmask, &sigsaved, error == -EINTR);



	return error;

}
@@ -2350,7 +2350,7 @@ COMPAT_SYSCALL_DEFINE6(epoll_pwait, int, epfd, 


	err = do_epoll_wait(epfd, events, maxevents, timeout);



	restore_user_sigmask(sigmask, &sigsaved);

	restore_user_sigmask(sigmask, &sigsaved, err == -EINTR);



	return err;

}

fs/io_uring.c

+4 −3
Original line number Diff line number Diff line
@@ -2200,11 +2200,12 @@ static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events, 
	}



	ret = wait_event_interruptible(ctx->wait, io_cqring_events(ring) >= min_events);

	if (ret == -ERESTARTSYS)

		ret = -EINTR;



	if (sig)

		restore_user_sigmask(sig, &sigsaved);

		restore_user_sigmask(sig, &sigsaved, ret == -ERESTARTSYS);



	if (ret == -ERESTARTSYS)

		ret = -EINTR;



	return READ_ONCE(ring->r.head) == READ_ONCE(ring->r.tail) ? ret : 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE