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

Commit a8f15585 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from ANdrew Morton:
 "8 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  revert "mm: make sure all file VMAs have ->vm_ops set"
  MAINTAINERS: update LTP mailing list
  userfaultfd: add missing mmput() in error path
  lib/string_helpers.c: fix infinite loop in string_get_size()
  alpha: lib: export __delay
  alpha: io: define ioremap_uc
  kasan: fix last shadow judgement in memory_is_poisoned_16()
  zram: fix possible use after free in zcomp_create()
parents 8e64a733 28c553d0

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -6452,11 +6452,11 @@ F: drivers/hwmon/ltc4261.c 
LTP (Linux Test Project)

M:	Mike Frysinger <vapier@gentoo.org>

M:	Cyril Hrubis <chrubis@suse.cz>

M:	Wanlong Gao <gaowanlong@cn.fujitsu.com>

M:	Wanlong Gao <wanlong.gao@gmail.com>

M:	Jan Stancek <jstancek@redhat.com>

M:	Stanislav Kholmanskikh <stanislav.kholmanskikh@oracle.com>

M:	Alexey Kodanev <alexey.kodanev@oracle.com>

L:	ltp-list@lists.sourceforge.net (subscribers-only)

L:	ltp@lists.linux.it (subscribers-only)

W:	http://linux-test-project.github.io/

T:	git git://github.com/linux-test-project/ltp.git

S:	Maintained

arch/alpha/include/asm/io.h

+3 −1
Original line number Diff line number Diff line
@@ -299,6 +299,8 @@ static inline void __iomem * ioremap_nocache(unsigned long offset, 
	return ioremap(offset, size);

}



#define ioremap_uc ioremap_nocache



static inline void iounmap(volatile void __iomem *addr)

{

	IO_CONCAT(__IO_PREFIX,iounmap)(addr);

arch/alpha/lib/udelay.c

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ __delay(int loops) 
		"	bgt %0,1b"

		: "=&r" (tmp), "=r" (loops) : "1"(loops));

}

EXPORT_SYMBOL(__delay);



#ifdef CONFIG_SMP

#define LPJ	 cpu_data[smp_processor_id()].loops_per_jiffy

drivers/block/zram/zcomp.c

+7 −5
Original line number Diff line number Diff line
@@ -330,12 +330,14 @@ void zcomp_destroy(struct zcomp *comp) 
 * allocate new zcomp and initialize it. return compressing

 * backend pointer or ERR_PTR if things went bad. ERR_PTR(-EINVAL)

 * if requested algorithm is not supported, ERR_PTR(-ENOMEM) in

 * case of allocation error.

 * case of allocation error, or any other error potentially

 * returned by functions zcomp_strm_{multi,single}_create.

 */

struct zcomp *zcomp_create(const char *compress, int max_strm)

{

	struct zcomp *comp;

	struct zcomp_backend *backend;

	int error;



	backend = find_backend(compress);

	if (!backend)
@@ -347,12 +349,12 @@ struct zcomp *zcomp_create(const char *compress, int max_strm) 


	comp->backend = backend;

	if (max_strm > 1)

		zcomp_strm_multi_create(comp, max_strm);

		error = zcomp_strm_multi_create(comp, max_strm);

	else

		zcomp_strm_single_create(comp);

	if (!comp->stream) {

		error = zcomp_strm_single_create(comp);

	if (error) {

		kfree(comp);

		return ERR_PTR(-ENOMEM);

		return ERR_PTR(error);

	}

	return comp;

}

fs/userfaultfd.c

+3 −1
Original line number Diff line number Diff line
@@ -1287,8 +1287,10 @@ static struct file *userfaultfd_file_create(int flags) 


	file = anon_inode_getfile("[userfaultfd]", &userfaultfd_fops, ctx,

				  O_RDWR | (flags & UFFD_SHARED_FCNTL_FLAGS));

	if (IS_ERR(file))

	if (IS_ERR(file)) {

		mmput(ctx->mm);

		kmem_cache_free(userfaultfd_ctx_cachep, ctx);

	}

out:

	return file;

}