Commit 6f664045 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mm-nonmm-stable-2022-05-26' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm 

Pull misc updates from Andrew Morton:
 "The non-MM patch queue for this merge window.

  Not a lot of material this cycle. Many singleton patches against
  various subsystems. Most notably some maintenance work in ocfs2
  and initramfs"

* tag 'mm-nonmm-stable-2022-05-26' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm: (65 commits)
  kcov: update pos before writing pc in trace function
  ocfs2: dlmfs: fix error handling of user_dlm_destroy_lock
  ocfs2: dlmfs: don't clear USER_LOCK_ATTACHED when destroying lock
  fs/ntfs: remove redundant variable idx
  fat: remove time truncations in vfat_create/vfat_mkdir
  fat: report creation time in statx
  fat: ignore ctime updates, and keep ctime identical to mtime in memory
  fat: split fat_truncate_time() into separate functions
  MAINTAINERS: add Muchun as a memcg reviewer
  proc/sysctl: make protected_* world readable
  ia64: mca: drop redundant spinlock initialization
  tty: fix deadlock caused by calling printk() under tty_port->lock
  relay: remove redundant assignment to pointer buf
  fs/ntfs3: validate BOOT sectors_per_clusters
  lib/string_helpers: fix not adding strarray to device's resource list
  kernel/crash_core.c: remove redundant check of ck_cmdline
  ELF, uapi: fixup ELF_ST_TYPE definition
  ipc/mqueue: use get_tree_nodev() in mqueue_get_tree()
  ipc: update semtimedop() to use hrtimer
  ipc/sem: remove redundant assignments
  ...
parents 8bdc2a19 3159d79b

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -5056,6 +5056,7 @@ M: Johannes Weiner <hannes@cmpxchg.org> 
M:	Michal Hocko <mhocko@kernel.org>

M:	Roman Gushchin <roman.gushchin@linux.dev>

M:	Shakeel Butt <shakeelb@google.com>

R:	Muchun Song <songmuchun@bytedance.com>

L:	cgroups@vger.kernel.org

L:	linux-mm@kvack.org

S:	Maintained
@@ -16097,7 +16098,6 @@ F: include/asm-generic/syscall.h 
F:	include/linux/ptrace.h

F:	include/linux/regset.h

F:	include/uapi/linux/ptrace.h

F:	include/uapi/linux/ptrace.h

F:	kernel/ptrace.c









PULSE8-CEC DRIVER
































arch/alpha/lib/csum_partial_copy.c



+0
−1






























Original line number
Diff line number
Diff line







@@ -353,7 +353,6 @@ csum_and_copy_from_user(const void __user *src, void *dst, int len)







		return 0;









	return __csum_and_copy(src, dst, len);









}









EXPORT_SYMBOL(csum_and_copy_from_user);



















__wsum









csum_partial_copy_nocheck(const void *src, void *dst, int len)
































arch/arm/kernel/crash_dump.c



+4
−23






























Original line number
Diff line number
Diff line







@@ -14,22 +14,10 @@







#include <linux/crash_dump.h>









#include <linux/uaccess.h>









#include <linux/io.h>









#include <linux/uio.h>



















/**









 * copy_oldmem_page() - copy one page from old kernel memory









 * @pfn: page frame number to be copied









 * @buf: buffer where the copied page is placed









 * @csize: number of bytes to copy









 * @offset: offset in bytes into the page









 * @userbuf: if set, @buf is int he user address space









 *









 * This function copies one page from old kernel memory into buffer pointed by









 * @buf. If @buf is in userspace, set @userbuf to %1. Returns number of bytes









 * copied or negative error in case of failure.









 */









ssize_t copy_oldmem_page(unsigned long pfn, char *buf,









			 size_t csize, unsigned long offset,









			 int userbuf)









ssize_t copy_oldmem_page(struct iov_iter *iter, unsigned long pfn,









			 size_t csize, unsigned long offset)









{









	void *vaddr;


















@@ -40,14 +28,7 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,







	if (!vaddr)









		return -ENOMEM;



















	if (userbuf) {









		if (copy_to_user(buf, vaddr + offset, csize)) {









			iounmap(vaddr);









			return -EFAULT;









		}









	} else {









		memcpy(buf, vaddr + offset, csize);









	}









	csize = copy_to_iter(vaddr + offset, csize, iter);



















	iounmap(vaddr);









	return csize;
































arch/arm64/kernel/crash_dump.c



+4
−25






























Original line number
Diff line number
Diff line







@@ -9,25 +9,11 @@







#include <linux/crash_dump.h>









#include <linux/errno.h>









#include <linux/io.h>









#include <linux/memblock.h>









#include <linux/uaccess.h>









#include <linux/uio.h>









#include <asm/memory.h>



















/**









 * copy_oldmem_page() - copy one page from old kernel memory









 * @pfn: page frame number to be copied









 * @buf: buffer where the copied page is placed









 * @csize: number of bytes to copy









 * @offset: offset in bytes into the page









 * @userbuf: if set, @buf is in a user address space









 *









 * This function copies one page from old kernel memory into buffer pointed by









 * @buf. If @buf is in userspace, set @userbuf to %1. Returns number of bytes









 * copied or negative error in case of failure.









 */









ssize_t copy_oldmem_page(unsigned long pfn, char *buf,









			 size_t csize, unsigned long offset,









			 int userbuf)









ssize_t copy_oldmem_page(struct iov_iter *iter, unsigned long pfn,









			 size_t csize, unsigned long offset)









{









	void *vaddr;


















@@ -38,14 +24,7 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,







	if (!vaddr)









		return -ENOMEM;



















	if (userbuf) {









		if (copy_to_user((char __user *)buf, vaddr + offset, csize)) {









			memunmap(vaddr);









			return -EFAULT;









		}









	} else {









		memcpy(buf, vaddr + offset, csize);









	}









	csize = copy_to_iter(vaddr + offset, csize, iter);



















	memunmap(vaddr);










































arch/ia64/kernel/crash_dump.c



+4
−28






























Original line number
Diff line number
Diff line







@@ -10,42 +10,18 @@







#include <linux/errno.h>









#include <linux/types.h>









#include <linux/crash_dump.h>



















#include <linux/uio.h>









#include <asm/page.h>









#include <linux/uaccess.h>



















/**









 * copy_oldmem_page - copy one page from "oldmem"









 * @pfn: page frame number to be copied









 * @buf: target memory address for the copy; this can be in kernel address









 *	space or user address space (see @userbuf)









 * @csize: number of bytes to copy









 * @offset: offset in bytes into the page (based on pfn) to begin the copy









 * @userbuf: if set, @buf is in user address space, use copy_to_user(),









 *	otherwise @buf is in kernel address space, use memcpy().









 *









 * Copy a page from "oldmem". For this page, there is no pte mapped









 * in the current kernel. We stitch up a pte, similar to kmap_atomic.









 *









 * Calling copy_to_user() in atomic context is not desirable. Hence first









 * copying the data to a pre-allocated kernel page and then copying to user









 * space in non-atomic context.









 */









ssize_t









copy_oldmem_page(unsigned long pfn, char *buf,









		size_t csize, unsigned long offset, int userbuf)









ssize_t copy_oldmem_page(struct iov_iter *iter, unsigned long pfn,









		size_t csize, unsigned long offset)









{









	void  *vaddr;



















	if (!csize)









		return 0;









	vaddr = __va(pfn<<PAGE_SHIFT);









	if (userbuf) {









		if (copy_to_user(buf, (vaddr + offset), csize)) {









			return -EFAULT;









		}









	} else









		memcpy(buf, (vaddr + offset), csize);









	csize = copy_to_iter(vaddr + offset, csize, iter);









	return csize;









}