Commit 1ce6ec91 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (fixes from Andrew) 

Pull misc fixes from Andrew Morton:
 "Ten fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  kernel/signal.c: stop info leak via the tkill and the tgkill syscalls
  mm/vmscan: fix error return in kswapd_run()
  hfsplus: fix potential overflow in hfsplus_file_truncate()
  avr32: fix build error in atstk1006_defconfig
  hugetlbfs: add swap entry check in follow_hugetlb_page()
  fs/binfmt_elf.c: fix hugetlb memory check in vma_dump_size()
  hugetlbfs: stop setting VM_DONTDUMP in initializing vma(VM_HUGETLB)
  checkpatch: fix stringification macro defect
  drivers/video/mmp/core.c: fix use-after-free bug
  thinkpad-acpi: kill hotkey_thread_mutex
parents 96d86834 b9e146d8

arch/avr32/include/asm/io.h

+4 −0
Original line number Diff line number Diff line
@@ -165,6 +165,10 @@ BUILDIO_IOPORT(l, u32) 
#define readw_be			__raw_readw

#define readl_be			__raw_readl



#define writeb_relaxed			writeb

#define writew_relaxed			writew

#define writel_relaxed			writel



#define writeb_be			__raw_writeb

#define writew_be			__raw_writew

#define writel_be			__raw_writel

drivers/platform/x86/thinkpad_acpi.c

+0 −10
Original line number Diff line number Diff line
@@ -1964,9 +1964,6 @@ struct tp_nvram_state { 
/* kthread for the hotkey poller */

static struct task_struct *tpacpi_hotkey_task;



/* Acquired while the poller kthread is running, use to sync start/stop */

static struct mutex hotkey_thread_mutex;



/*

 * Acquire mutex to write poller control variables as an

 * atomic block.
@@ -2462,8 +2459,6 @@ static int hotkey_kthread(void *data) 
	unsigned int poll_freq;

	bool was_frozen;



	mutex_lock(&hotkey_thread_mutex);



	if (tpacpi_lifecycle == TPACPI_LIFE_EXITING)

		goto exit;
@@ -2523,7 +2518,6 @@ static int hotkey_kthread(void *data) 
	}



exit:

	mutex_unlock(&hotkey_thread_mutex);

	return 0;

}
@@ -2533,9 +2527,6 @@ static void hotkey_poll_stop_sync(void) 
	if (tpacpi_hotkey_task) {

		kthread_stop(tpacpi_hotkey_task);

		tpacpi_hotkey_task = NULL;

		mutex_lock(&hotkey_thread_mutex);

		/* at this point, the thread did exit */

		mutex_unlock(&hotkey_thread_mutex);

	}

}
@@ -3234,7 +3225,6 @@ static int __init hotkey_init(struct ibm_init_struct *iibm) 
	mutex_init(&hotkey_mutex);



#ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL

	mutex_init(&hotkey_thread_mutex);

	mutex_init(&hotkey_thread_data_mutex);

#endif

drivers/video/mmp/core.c

+0 −2
Original line number Diff line number Diff line
@@ -252,7 +252,5 @@ void mmp_unregister_path(struct mmp_path *path) 


	kfree(path);

	mutex_unlock(&disp_lock);



	dev_info(path->dev, "de-register %s\n", path->name);

}

EXPORT_SYMBOL_GPL(mmp_unregister_path);

fs/binfmt_elf.c

+1 −0
Original line number Diff line number Diff line
@@ -1137,6 +1137,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma, 
			goto whole;

		if (!(vma->vm_flags & VM_SHARED) && FILTER(HUGETLB_PRIVATE))

			goto whole;

		return 0;

	}



	/* Do not dump I/O mapped devices or special mappings */

fs/hfsplus/extents.c

+1 −1
Original line number Diff line number Diff line
@@ -533,7 +533,7 @@ void hfsplus_file_truncate(struct inode *inode) 
		struct address_space *mapping = inode->i_mapping;

		struct page *page;

		void *fsdata;

		u32 size = inode->i_size;

		loff_t size = inode->i_size;



		res = pagecache_write_begin(NULL, mapping, size, 0,

						AOP_FLAG_UNINTERRUPTIBLE,

CRA Git | Maintained and supported by SUSTech CRA and CCSE