Commit 68845a55 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' into master (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "Subsystems affected by this patch series: mm/pagemap, mm/shmem,
  mm/hotfixes, mm/memcg, mm/hugetlb, mailmap, squashfs, scripts,
  io-mapping, MAINTAINERS, and gdb"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  scripts/gdb: fix lx-symbols 'gdb.error' while loading modules
  MAINTAINERS: add KCOV section
  io-mapping: indicate mapping failure
  scripts/decode_stacktrace: strip basepath from all paths
  squashfs: fix length field overlap check in metadata reading
  mailmap: add entry for Mike Rapoport
  khugepaged: fix null-pointer dereference due to race
  mm/hugetlb: avoid hardcoding while checking if cma is enabled
  mm: memcg/slab: fix memory leak at non-root kmem_cache destroy
  mm/memcg: fix refcount error while moving and swapping
  mm/memcontrol: fix OOPS inside mem_cgroup_get_nr_swap_pages()
  mm: initialize return of vm_insert_pages
  vfs/xattr: mm/shmem: kernfs: release simple xattr entry in a right way
  mm/mmap.c: close race between munmap() and expand_upwards()/downwards()
parents c953d60b 7359608a

.mailmap

+3 −0
Original line number Diff line number Diff line
@@ -198,6 +198,9 @@ Maxime Ripard <mripard@kernel.org> <maxime.ripard@free-electrons.com> 
Mayuresh Janorkar <mayur@ti.com>

Michael Buesch <m@bues.ch>

Michel Dänzer <michel@tungstengraphics.com>

Mike Rapoport <rppt@kernel.org> <mike@compulab.co.il>

Mike Rapoport <rppt@kernel.org> <mike.rapoport@gmail.com>

Mike Rapoport <rppt@kernel.org> <rppt@linux.ibm.com>

Miodrag Dinic <miodrag.dinic@mips.com> <miodrag.dinic@imgtec.com>

Miquel Raynal <miquel.raynal@bootlin.com> <miquel.raynal@free-electrons.com>

Mitesh shah <mshah@teja.com>

MAINTAINERS

+11 −0
Original line number Diff line number Diff line
@@ -9306,6 +9306,17 @@ F: Documentation/kbuild/kconfig* 
F:	scripts/Kconfig.include

F:	scripts/kconfig/













KCOV













R:	Dmitry Vyukov <dvyukov@google.com>













R:	Andrey Konovalov <andreyknvl@google.com>













L:	kasan-dev@googlegroups.com













S:	Maintained













F:	Documentation/dev-tools/kcov.rst













F:	include/linux/kcov.h













F:	include/uapi/linux/kcov.h













F:	kernel/kcov.c













F:	scripts/Makefile.kcov



























KCSAN















M:	Marco Elver <elver@google.com>















R:	Dmitry Vyukov <dvyukov@google.com>

































fs/squashfs/block.c



+1
−1






























Original line number
Diff line number
Diff line








@@ -175,7 +175,7 @@ int squashfs_read_data(struct super_block *sb, u64 index, int length,













		/* Extract the length of the metadata block */















		data = page_address(bvec->bv_page) + bvec->bv_offset;















		length = data[offset];













		if (offset <= bvec->bv_len - 1) {













		if (offset < bvec->bv_len - 1) {















			length |= data[offset + 1] << 8;















		} else {















			if (WARN_ON_ONCE(!bio_next_segment(bio, &iter_all))) {

































include/linux/io-mapping.h



+4
−1






























Original line number
Diff line number
Diff line








@@ -107,9 +107,12 @@ io_mapping_init_wc(struct io_mapping *iomap,













		   resource_size_t base,















		   unsigned long size)















{













	iomap->iomem = ioremap_wc(base, size);













	if (!iomap->iomem)













		return NULL;





























	iomap->base = base;















	iomap->size = size;













	iomap->iomem = ioremap_wc(base, size);















#if defined(pgprot_noncached_wc) /* archs can't agree on a name ... */















	iomap->prot = pgprot_noncached_wc(PAGE_KERNEL);















#elif defined(pgprot_writecombine)

































include/linux/xattr.h



+2
−1






























Original line number
Diff line number
Diff line








@@ -15,6 +15,7 @@













#include <linux/slab.h>















#include <linux/types.h>















#include <linux/spinlock.h>













#include <linux/mm.h>















#include <uapi/linux/xattr.h>































struct inode;










@@ -94,7 +95,7 @@ static inline void simple_xattrs_free(struct simple_xattrs *xattrs)





























	list_for_each_entry_safe(xattr, node, &xattrs->head, list) {















		kfree(xattr->name);













		kfree(xattr);













		kvfree(xattr);















	}















}

























































































CRA Git | Maintained and supported by SUSTech CRA and CCSE