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

Commit 9a4e31c2 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 3.18.10 into android-3.18



Changes in 3.18.10:
	flowcache: Fix kernel panic in flow_cache_flush_task
	ipv6: addrconf: add missing validate_link_af handler
	pktgen: fix UDP checksum computation
	rtnetlink: ifla_vf_policy: fix misuses of NLA_BINARY
	tcp: make sure skb is not shared before using skb_get()
	ipv6: fix ipv6_cow_metrics for non DST_HOST case
	rtnetlink: call ->dellink on failure when ->newlink exists
	gen_stats.c: Duplicate xstats buffer for later use
	ipv4: ip_check_defrag should correctly check return value of skb_copy_bits
	ipv4: ip_check_defrag should not assume that skb_network_offset is zero
	net: phy: Fix verification of EEE support in phy_init_eee
	ematch: Fix auto-loading of ematch modules.
	openvswitch: Fix net exit.
	sock: sock_dequeue_err_skb() needs hard irq safety
	net: reject creation of netdev names with colons
	Revert "r8169: add support for Byte Queue Limits"
	net: pktgen: disable xmit_clone on virtual devices
	team: fix possible null pointer dereference in team_handle_frame
	net: compat: Ignore MSG_CMSG_COMPAT in compat_sys_{send, recv}msg
	macvtap: make sure neighbour code can push ethernet header
	net: bcmgenet: fix throughtput regression
	net: do not use rcu in rtnl_dump_ifinfo()
	usb: plusb: Add support for National Instruments host-to-host cable
	udp: only allow UFO for packets from SOCK_DGRAM sockets
	net: ping: Return EAFNOSUPPORT when appropriate.
	team: don't traverse port list using rcu in team_set_mac_address
	mm/hugetlb: fix getting refcount 0 page in hugetlb_fault()
	mm/hugetlb: add migration/hwpoisoned entry check in hugetlb_change_protection
	mm/hugetlb: add migration entry check in __unmap_hugepage_range
	mm, hugetlb: remove unnecessary lower bound on sysctl handlers"?
	mm: when stealing freepages, also take pages created by splitting buddy page
	mm/mmap.c: fix arithmetic overflow in __vm_enough_memory()
	mm/nommu.c: fix arithmetic overflow in __vm_enough_memory()
	mm/compaction: fix wrong order check in compact_finished()
	mm/memory.c: actually remap enough memory
	mm: fix negative nr_isolated counts
	drm/tegra: Use correct relocation target offsets
	drm/radeon: Don't try to enable write-combining without PAT
	drm/radeon: only enable kv/kb dpm interrupts once v3
	drm/radeon: workaround for CP HW bug on CIK
	drm/radeon/dp: Set EDP_CONFIGURATION_SET for bridge chips if necessary
	drm/radeon: fix voltage setup on hawaii
	drm/i915: Insert a command barrier on BLT/BSD cache flushes
	drm/i915: Drop vblank wait from intel_dp_link_down
	drm/i915: Prevent use-after-free in invalidate_range_start callback
	drm/i915: Correct the IOSF Dev_FN field for IOSF transfers
	target: Fix PR_APTPL_BUF_LEN buffer size limitation
	target: Add missing WRITE_SAME end-of-device sanity check
	target: Check for LBA + sectors wrap-around in sbc_parse_cdb
	x86/asm/entry/64: Remove a bogus 'ret_from_fork' optimization
	x86/fpu/xsaves: Fix improper uses of __ex_table
	iio: mxs-lradc: fix iio channel map regression
	iio: imu: adis16400: Fix sign extension
	iio: mxs-lradc: separate touchscreen and buffer virtual channels
	iio: mxs-lradc: make ADC reads not disable touchscreen interrupts
	iio: mxs-lradc: make ADC reads not unschedule touchscreen conversions
	iio: mxs-lradc: only update the buffer when its conversions have finished
	iio: ad5686: fix optional reference voltage declaration
	iio:adc:mcp3422 Fix incorrect scales table
	mei: make device disabled on stop unconditionally
	Btrfs: fix fsync race leading to ordered extent memory leaks
	btrfs: fix lost return value due to variable shadowing
	Btrfs: fix data loss in the fast fsync path
	Btrfs:__add_inode_ref: out of bounds memory read when looking for extended ref.
	KVM: emulate: fix CMPXCHG8B on 32-bit hosts
	KVM: MIPS: Fix trace event to save PC directly
	uas: Add US_FL_NO_REPORT_OPCODES for JMicron JMS539
	Revert "USB: serial: make bulk_out_size a lower limit"
	USB: serial: cp210x: Adding Seletek device id's
	USB: mxuport: fix null deref when used as a console
	USB: usbfs: don't leak kernel data in siginfo
	USB: ftdi_sio: add PIDs for Actisense USB devices
	usb: ftdi_sio: Add jtag quirk support for Cyber Cortex AV boards
	usb: dwc3: dwc3-omap: Fix disable IRQ
	usb: gadget: configfs: don't NUL-terminate (sub)compatible ids
	usb: XHCI: platform: Move the Marvell quirks after the enabling the clocks
	xhci: Allocate correct amount of scratchpad buffers
	xhci: fix reporting of 0-sized URBs in control endpoint
	xhci: Workaround for PME stuck issues in Intel xhci
	mac80211: Send EAPOL frames at lowest rate
	net: irda: fix wait_until_sent poll timeout
	USB: serial: fix infinite wait_until_sent timeout
	TTY: fix tty_wait_until_sent on 64-bit machines
	USB: serial: fix potential use-after-free after failed probe
	USB: serial: fix tty-device error handling at probe
	autofs4 copy_dev_ioctl(): keep the value of ->size we'd used for allocation
	debugfs: leave freeing a symlink body until inode eviction
	procfs: fix race between symlink removals and traversals
	sunrpc: fix braino in ->poll()
	SUNRPC: Always manipulate rpc_rqst::rq_bc_pa_list under xprt->bc_pa_lock
	ARC: Fix KSTK_ESP()
	tty: fix up atime/mtime mess, take four
	serial: 8250: Revert "tty: serial: 8250_core: read only RX if there is something in the FIFO"
	ALSA: pcm: Don't leave PREPARED state after draining
	ALSA: hda - Add pin configs for ASUS mobo with IDT 92HD73XX codec
	ALSA: hda: controller code - do not export static functions
	ALSA: hda - Disable runtime PM for Panther Point again
	ALSA: hda - One more Dell macine needs DELL1_MIC_NO_PRESENCE quirk
	locking/rtmutex: Avoid a NULL pointer dereference on deadlock
	sg: fix read() error reporting
	IB/qib: Do not write EEPROM
	IB/iser: Fix memory regions possible leak
	IB/iser: Use correct dma direction when unmapping SGs
	IB/mlx5: Fix error code in get_port_caps()
	IB/mlx4: Fix memory leak in __mlx4_ib_modify_qp
	IB/mlx4: Fix wrong usage of IPv4 protocol for multicast attach/detach
	IB/core: Fix deadlock on uverbs modify_qp error flow
	IB/core: When marshaling ucma path from user-space, clear unused fields
	nilfs2: fix potential memory overrun on inode
	fixed invalid assignment of 64bit mask to host dma_boundary for scatter gather segment boundary limit.
	clk: zynq: Force CPU_2X clock to be ungated
	clk: Fix debugfs clk removal before inited
	sunxi: clk: Set sun6i-pll1 n_start = 1
	staging: comedi: comedi_compat32.c: fix COMEDI_CMD copy back
	dm mirror: do not degrade the mirror on discard error
	dm io: reject unsupported DISCARD requests with EOPNOTSUPP
	dm: fix a race condition in dm_get_md
	dm snapshot: fix a possible invalid memory access on unload
	staging: comedi: cb_pcidas64: fix incorrect AI range code handling
	HID: input: fix confusion on conflicting mappings
	HID: fixup the conflicting keyboard mappings quirk
	HID: wacom: Report ABS_MISC event for Cintiq Companion Hybrid
	drm/radeon: enable native backlight control on old macs
	drm/radeon: use drm_mode_vrefresh() rather than mode->vrefresh
	drm/radeon: fix 1 RB harvest config setup for TN/RL
	drm/i915/bdw: PCI IDs ending in 0xb are ULT.
	drm/i915: Check obj->vma_list under the struct_mutex
	drm/i915: Dell Chromebook 11 has PWM backlight
	drm/i915: avoid processing spurious/shared interrupts in low-power states
	reservation: Remove shadowing local variable 'ret'
	nfsd: fix clp->cl_revoked list deletion causing softlock in nfsd
	efi: Small leak on error in runtime map code
	efi/libstub: Fix boundary checking in efi_high_alloc()
	eCryptfs: don't pass fs-specific ioctl commands through
	ACPI / video: Load the module even if ACPI is disabled
	ACPI / LPSS: provide con_id for the clkdev
	NFS: Don't invalidate a submounted dentry in nfs_prime_dcache()
	NFSv4: Don't call put_rpccred() under the rcu_read_lock()
	ASoC: omap-pcm: Correct dma mask
	ASoC: rt5670: Set RT5670_IRQ_CTRL1 non volatile
	stable_kernel_rules: reorganize and update submission options
	sched: Fix hrtick_start() on UP
	of/pci: Free resources on failure in of_pci_get_host_bridge_resources()
	GFS2: Fix crash during ACL deletion in acl max entry check in gfs2_set_acl()
	ath5k: fix spontaneus AR5312 freezes
	pinctrl: pinctrl-imx: don't use invalid value of conf_reg
	pinctrl: imx25: fix numbering for pins
	vmstat: do not use deferrable delayed work for vmstat_update
	sched/autogroup: Fix failure to set cpu.rt_runtime_us
	clk-gate: fix bit # check in clk_register_gate()
	cxl: Use image state defaults for reloading FPGA
	cxl: Fix device_node reference counting
	cxl: Add missing return statement after handling AFU errror
	Linux 3.18.10

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 185c5475 96e199f1
Loading
Loading
Loading
Loading
+34 −10
Original line number Diff line number Diff line
@@ -32,18 +32,42 @@ Procedure for submitting patches to the -stable tree:
 - If the patch covers files in net/ or drivers/net please follow netdev stable
   submission guidelines as described in
   Documentation/networking/netdev-FAQ.txt
 - Send the patch, after verifying that it follows the above rules, to
   stable@vger.kernel.org.  You must note the upstream commit ID in the
   changelog of your submission, as well as the kernel version you wish
   it to be applied to.
 - To have the patch automatically included in the stable tree, add the tag
 - Security patches should not be handled (solely) by the -stable review
   process but should follow the procedures in Documentation/SecurityBugs.

For all other submissions, choose one of the following procedures:

   --- Option 1 ---

   To have the patch automatically included in the stable tree, add the tag
     Cc: stable@vger.kernel.org
   in the sign-off area. Once the patch is merged it will be applied to
   the stable tree without anything else needing to be done by the author
   or subsystem maintainer.
 - If the patch requires other patches as prerequisites which can be
   cherry-picked, then this can be specified in the following format in
   the sign-off area:

   --- Option 2 ---

   After the patch has been merged to Linus' tree, send an email to
   stable@vger.kernel.org containing the subject of the patch, the commit ID,
   why you think it should be applied, and what kernel version you wish it to
   be applied to.

   --- Option 3 ---

   Send the patch, after verifying that it follows the above rules, to
   stable@vger.kernel.org.  You must note the upstream commit ID in the
   changelog of your submission, as well as the kernel version you wish
   it to be applied to.

Option 1 is probably the easiest and most common. Options 2 and 3 are more
useful if the patch isn't deemed worthy at the time it is applied to a public
git tree (for instance, because it deserves more regression testing first).
Option 3 is especially useful if the patch needs some special handling to apply
to an older kernel (e.g., if API's have changed in the meantime).

Additionally, some patches submitted via Option 1 may have additional patch
prerequisites which can be cherry-picked. This can be specified in the following
format in the sign-off area:

     Cc: <stable@vger.kernel.org> # 3.3.x: a1f84a3: sched: Check for idle
     Cc: <stable@vger.kernel.org> # 3.3.x: 1b9508f: sched: Rate-limit newidle
@@ -57,13 +81,13 @@ Procedure for submitting patches to the -stable tree:
     git cherry-pick fd21073
     git cherry-pick <this commit>

Following the submission:

 - The sender will receive an ACK when the patch has been accepted into the
   queue, or a NAK if the patch is rejected.  This response might take a few
   days, according to the developer's schedules.
 - If accepted, the patch will be added to the -stable queue, for review by
   other developers and by the relevant subsystem maintainer.
 - Security patches should not be sent to this alias, but instead to the
   documented security@kernel.org address.


Review cycle:
+1 −1
Original line number Diff line number Diff line
VERSION = 3
PATCHLEVEL = 18
SUBLEVEL = 9
SUBLEVEL = 10
EXTRAVERSION =
NAME = Shuffling Zombie Juror

+5 −4
Original line number Diff line number Diff line
@@ -75,18 +75,19 @@ unsigned long thread_saved_pc(struct task_struct *t);
#define release_segments(mm)        do { } while (0)

#define KSTK_EIP(tsk)   (task_pt_regs(tsk)->ret)
#define KSTK_ESP(tsk)   (task_pt_regs(tsk)->sp)

/*
 * Where abouts of Task's sp, fp, blink when it was last seen in kernel mode.
 * Look in process.c for details of kernel stack layout
 */
#define KSTK_ESP(tsk)   (tsk->thread.ksp)
#define TSK_K_ESP(tsk)		(tsk->thread.ksp)

#define KSTK_REG(tsk, off)	(*((unsigned int *)(KSTK_ESP(tsk) + \
#define TSK_K_REG(tsk, off)	(*((unsigned int *)(TSK_K_ESP(tsk) + \
					sizeof(struct callee_regs) + off)))

#define KSTK_BLINK(tsk) KSTK_REG(tsk, 4)
#define KSTK_FP(tsk)    KSTK_REG(tsk, 0)
#define TSK_K_BLINK(tsk)	TSK_K_REG(tsk, 4)
#define TSK_K_FP(tsk)		TSK_K_REG(tsk, 0)

extern void start_thread(struct pt_regs * regs, unsigned long pc,
			 unsigned long usp);
+3 −3
Original line number Diff line number Diff line
@@ -64,9 +64,9 @@ static void seed_unwind_frame_info(struct task_struct *tsk,

		frame_info->task = tsk;

		frame_info->regs.r27 = KSTK_FP(tsk);
		frame_info->regs.r28 = KSTK_ESP(tsk);
		frame_info->regs.r31 = KSTK_BLINK(tsk);
		frame_info->regs.r27 = TSK_K_FP(tsk);
		frame_info->regs.r28 = TSK_K_ESP(tsk);
		frame_info->regs.r31 = TSK_K_BLINK(tsk);
		frame_info->regs.r63 = (unsigned int)__switch_to;

		/* In the prologue of __switch_to, first FP is saved on stack
+3 −3
Original line number Diff line number Diff line
@@ -24,18 +24,18 @@ TRACE_EVENT(kvm_exit,
	    TP_PROTO(struct kvm_vcpu *vcpu, unsigned int reason),
	    TP_ARGS(vcpu, reason),
	    TP_STRUCT__entry(
			__field(struct kvm_vcpu *, vcpu)
			__field(unsigned long, pc)
			__field(unsigned int, reason)
	    ),

	    TP_fast_assign(
			__entry->vcpu = vcpu;
			__entry->pc = vcpu->arch.pc;
			__entry->reason = reason;
	    ),

	    TP_printk("[%s]PC: 0x%08lx",
		      kvm_mips_exit_types_str[__entry->reason],
		      __entry->vcpu->arch.pc)
		      __entry->pc)
);

#endif /* _TRACE_KVM_H */
Loading