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

Commit 5e107580 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.9.138 into android-4.9 



Changes in 4.9.138
	powerpc/eeh: Fix possible null deref in eeh_dump_dev_log()
	tty: check name length in tty_find_polling_driver()
	ARM: imx_v6_v7_defconfig: Select CONFIG_TMPFS_POSIX_ACL
	powerpc/nohash: fix undefined behaviour when testing page size support
	drm/omap: fix memory barrier bug in DMM driver
	media: pci: cx23885: handle adding to list failure
	MIPS: kexec: Mark CPU offline before disabling local IRQ
	powerpc/boot: Ensure _zimage_start is a weak symbol
	MIPS/PCI: Call pcie_bus_configure_settings() to set MPS/MRRS
	sc16is7xx: Fix for multi-channel stall
	media: tvp5150: fix width alignment during set_selection()
	powerpc/selftests: Wait all threads to join
	9p locks: fix glock.client_id leak in do_lock
	9p: clear dangling pointers in p9stat_free
	cdrom: fix improper type cast, which can leat to information leak.
	scsi: qla2xxx: Fix incorrect port speed being set for FC adapters
	scsi: qla2xxx: shutdown chip if reset fail
	fuse: Fix use-after-free in fuse_dev_do_read()
	fuse: Fix use-after-free in fuse_dev_do_write()
	fuse: fix blocked_waitq wakeup
	fuse: set FR_SENT while locked
	mm: do not bug_on on incorrect length in __mm_populate()
	e1000: avoid null pointer dereference on invalid stat type
	e1000: fix race condition between e1000_down() and e1000_watchdog
	bna: ethtool: Avoid reading past end of buffer
	parisc: Align os_hpmc_size on word boundary
	parisc: Fix HPMC handler by increasing size to multiple of 16 bytes
	parisc: Fix exported address of os_hpmc handler
	MIPS: Loongson-3: Fix CPU UART irq delivery problem
	MIPS: Loongson-3: Fix BRIDGE irq delivery problem
	xtensa: add NOTES section to the linker script
	xtensa: make sure bFLT stack is 16 byte aligned
	xtensa: fix boot parameters address translation
	clk: s2mps11: Fix matching when built as module and DT node contains compatible
	clk: at91: Fix division by zero in PLL recalc_rate()
	clk: rockchip: Fix static checker warning in rockchip_ddrclk_get_parent call
	libceph: bump CEPH_MSG_MAX_DATA_LEN
	Revert "ceph: fix dentry leak in splice_dentry()"
	mach64: fix display corruption on big endian machines
	mach64: fix image corruption due to reading accelerator registers
	reset: hisilicon: fix potential NULL pointer dereference
	vhost/scsi: truncate T10 PI iov_iter to prot_bytes
	ocfs2: fix a misuse a of brelse after failing ocfs2_check_dir_entry
	mm: thp: relax __GFP_THISNODE for MADV_HUGEPAGE mappings
	netfilter: conntrack: fix calculation of next bucket number in early_drop
	mtd: docg3: don't set conflicting BCH_CONST_PARAMS option
	of, numa: Validate some distance map rules
	termios, tty/tty_baudrate.c: fix buffer overrun
	arch/alpha, termios: implement BOTHER, IBSHIFT and termios2
	Btrfs: fix cur_offset in the error case for nocow
	Btrfs: fix data corruption due to cloning of eof block
	clockevents/drivers/i8253: Add support for PIT shutdown quirk
	ext4: add missing brelse() update_backups()'s error path
	ext4: add missing brelse() in set_flexbg_block_bitmap()'s error path
	ext4: add missing brelse() add_new_gdb_meta_bg()'s error path
	ext4: avoid potential extra brelse in setup_new_flex_group_blocks()
	ext4: fix possible inode leak in the retry loop of ext4_resize_fs()
	ext4: avoid buffer leak in ext4_orphan_add() after prior errors
	ext4: fix missing cleanup if ext4_alloc_flex_bg_array() fails while resizing
	ext4: avoid possible double brelse() in add_new_gdb() on error path
	ext4: fix possible leak of sbi->s_group_desc_leak in error path
	ext4: fix possible leak of s_journal_flag_rwsem in error path
	ext4: release bs.bh before re-using in ext4_xattr_block_find()
	ext4: fix buffer leak in ext4_xattr_move_to_block() on error path
	ext4: fix buffer leak in __ext4_read_dirblock() on error path
	mount: Retest MNT_LOCKED in do_umount
	mount: Don't allow copying MNT_UNBINDABLE|MNT_LOCKED mounts
	mount: Prevent MNT_DETACH from disconnecting locked mounts
	sunrpc: correct the computation for page_ptr when truncating
	nfsd: COPY and CLONE operations require the saved filehandle to be set
	rtc: hctosys: Add missing range error reporting
	fuse: fix use-after-free in fuse_direct_IO()
	fuse: fix leaked notify reply
	configfs: replace strncpy with memcpy
	lib/ubsan.c: don't mark __ubsan_handle_builtin_unreachable as noreturn
	hugetlbfs: fix kernel BUG at fs/hugetlbfs/inode.c:444!
	mm: migration: fix migration of huge PMD shared pages
	drm/rockchip: Allow driver to be shutdown on reboot/kexec
	drm/dp_mst: Check if primary mstb is null
	drm/i915/hdmi: Add HDMI 2.0 audio clock recovery N values
	drm/i915/execlists: Force write serialisation into context image vs execution
	KVM: arm64: Fix caching of host MDCR_EL2 value
	Linux 4.9.138

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents e1260beb 7a4dc3f8

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 137

SUBLEVEL = 138

EXTRAVERSION =

NAME = Roaring Lionus

arch/alpha/include/asm/termios.h

+7 −1
Original line number Diff line number Diff line
@@ -72,9 +72,15 @@ 
})



#define user_termios_to_kernel_termios(k, u) \

	copy_from_user(k, u, sizeof(struct termios))

	copy_from_user(k, u, sizeof(struct termios2))



#define kernel_termios_to_user_termios(u, k) \

	copy_to_user(u, k, sizeof(struct termios2))



#define user_termios_to_kernel_termios_1(k, u) \

	copy_from_user(k, u, sizeof(struct termios))



#define kernel_termios_to_user_termios_1(u, k) \

	copy_to_user(u, k, sizeof(struct termios))



#endif	/* _ALPHA_TERMIOS_H */

arch/alpha/include/uapi/asm/ioctls.h

+5 −0
Original line number Diff line number Diff line
@@ -31,6 +31,11 @@ 
#define TCXONC		_IO('t', 30)

#define TCFLSH		_IO('t', 31)



#define TCGETS2		_IOR('T', 42, struct termios2)

#define TCSETS2		_IOW('T', 43, struct termios2)

#define TCSETSW2	_IOW('T', 44, struct termios2)

#define TCSETSF2	_IOW('T', 45, struct termios2)



#define TIOCSWINSZ	_IOW('t', 103, struct winsize)

#define TIOCGWINSZ	_IOR('t', 104, struct winsize)

#define	TIOCSTART	_IO('t', 110)		/* start output, like ^Q */

arch/alpha/include/uapi/asm/termbits.h

+17 −0
Original line number Diff line number Diff line
@@ -25,6 +25,19 @@ struct termios { 
	speed_t c_ospeed;		/* output speed */

};



/* Alpha has identical termios and termios2 */



struct termios2 {

	tcflag_t c_iflag;		/* input mode flags */

	tcflag_t c_oflag;		/* output mode flags */

	tcflag_t c_cflag;		/* control mode flags */

	tcflag_t c_lflag;		/* local mode flags */

	cc_t c_cc[NCCS];		/* control characters */

	cc_t c_line;			/* line discipline (== c_cc[19]) */

	speed_t c_ispeed;		/* input speed */

	speed_t c_ospeed;		/* output speed */

};



/* Alpha has matching termios and ktermios */



struct ktermios {
@@ -147,6 +160,7 @@ struct ktermios { 
#define B3000000  00034

#define B3500000  00035

#define B4000000  00036

#define BOTHER    00037



#define CSIZE	00001400

#define   CS5	00000000
@@ -164,6 +178,9 @@ struct ktermios { 
#define CMSPAR	  010000000000		/* mark or space (stick) parity */

#define CRTSCTS	  020000000000		/* flow control */



#define CIBAUD	07600000

#define IBSHIFT	16



/* c_lflag bits */

#define ISIG	0x00000080

#define ICANON	0x00000100

arch/arm/configs/imx_v6_v7_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -361,6 +361,7 @@ CONFIG_ZISOFS=y 
CONFIG_UDF_FS=m

CONFIG_MSDOS_FS=m

CONFIG_VFAT_FS=y

CONFIG_TMPFS_POSIX_ACL=y

CONFIG_JFFS2_FS=y

CONFIG_UBIFS_FS=y

CONFIG_NFS_FS=y