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

Commit 47b77b8d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.9.118 into android-4.9 



Changes in 4.9.118
	ipv4: remove BUG_ON() from fib_compute_spec_dst
	net: ena: Fix use of uninitialized DMA address bits field
	net: fix amd-xgbe flow-control issue
	net: lan78xx: fix rx handling before first packet is send
	net: mdio-mux: bcm-iproc: fix wrong getter and setter pair
	NET: stmmac: align DMA stuff to largest cache line length
	tcp_bbr: fix bw probing to raise in-flight data for very small BDPs
	xen-netfront: wait xenbus state change when load module manually
	tcp: do not force quickack when receiving out-of-order packets
	tcp: add max_quickacks param to tcp_incr_quickack and tcp_enter_quickack_mode
	tcp: do not aggressively quick ack after ECN events
	tcp: refactor tcp_ecn_check_ce to remove sk type cast
	tcp: add one more quick ack after after ECN events
	pinctrl: intel: Read back TX buffer state
	sched/wait: Remove the lockless swait_active() check in swake_up*()
	bonding: avoid lockdep confusion in bond_get_stats()
	inet: frag: enforce memory limits earlier
	ipv4: frags: handle possible skb truesize change
	net: dsa: Do not suspend/resume closed slave_dev
	netlink: Fix spectre v1 gadget in netlink_create()
	net: stmmac: Fix WoL for PCI-based setups
	squashfs: more metadata hardening
	squashfs: more metadata hardenings
	can: ems_usb: Fix memory leak on ems_usb_disconnect()
	net: socket: fix potential spectre v1 gadget in socketcall
	virtio_balloon: fix another race between migration and ballooning
	kvm: x86: vmx: fix vpid leak
	crypto: padlock-aes - Fix Nano workaround data corruption
	drm/vc4: Reset ->{x, y}_scaling[1] when dealing with uniplanar formats
	scsi: sg: fix minor memory leak in error path
	Linux 4.9.118

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 8b21e85d e01202b3

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 117

SUBLEVEL = 118

EXTRAVERSION =

NAME = Roaring Lionus

arch/x86/kvm/vmx.c

+3 −4
Original line number Diff line number Diff line
@@ -7085,6 +7085,8 @@ static int handle_vmon(struct kvm_vcpu *vcpu) 
		     HRTIMER_MODE_REL_PINNED);

	vmx->nested.preemption_timer.function = vmx_preemption_timer_fn;



	vmx->nested.vpid02 = allocate_vpid();



	vmx->nested.vmxon = true;



	skip_emulated_instruction(vcpu);
@@ -9263,10 +9265,8 @@ static struct kvm_vcpu *vmx_create_vcpu(struct kvm *kvm, unsigned int id) 
			goto free_vmcs;

	}



	if (nested) {

	if (nested)

		nested_vmx_setup_ctls_msrs(vmx);

		vmx->nested.vpid02 = allocate_vpid();

	}



	vmx->nested.posted_intr_nv = -1;

	vmx->nested.current_vmptr = -1ull;
@@ -9284,7 +9284,6 @@ static struct kvm_vcpu *vmx_create_vcpu(struct kvm *kvm, unsigned int id) 
	return &vmx->vcpu;



free_vmcs:

	free_vpid(vmx->nested.vpid02);

	free_loaded_vmcs(vmx->loaded_vmcs);

free_msrs:

	kfree(vmx->guest_msrs);

drivers/crypto/padlock-aes.c

+6 −2
Original line number Diff line number Diff line
@@ -266,6 +266,8 @@ static inline void padlock_xcrypt_ecb(const u8 *input, u8 *output, void *key, 
		return;

	}



	count -= initial;



	if (initial)

		asm volatile (".byte 0xf3,0x0f,0xa7,0xc8"	/* rep xcryptecb */

			      : "+S"(input), "+D"(output)
@@ -273,7 +275,7 @@ static inline void padlock_xcrypt_ecb(const u8 *input, u8 *output, void *key, 


	asm volatile (".byte 0xf3,0x0f,0xa7,0xc8"	/* rep xcryptecb */

		      : "+S"(input), "+D"(output)

		      : "d"(control_word), "b"(key), "c"(count - initial));

		      : "d"(control_word), "b"(key), "c"(count));

}



static inline u8 *padlock_xcrypt_cbc(const u8 *input, u8 *output, void *key,
@@ -284,6 +286,8 @@ static inline u8 *padlock_xcrypt_cbc(const u8 *input, u8 *output, void *key, 
	if (count < cbc_fetch_blocks)

		return cbc_crypt(input, output, key, iv, control_word, count);



	count -= initial;



	if (initial)

		asm volatile (".byte 0xf3,0x0f,0xa7,0xd0"	/* rep xcryptcbc */

			      : "+S" (input), "+D" (output), "+a" (iv)
@@ -291,7 +295,7 @@ static inline u8 *padlock_xcrypt_cbc(const u8 *input, u8 *output, void *key, 


	asm volatile (".byte 0xf3,0x0f,0xa7,0xd0"	/* rep xcryptcbc */

		      : "+S" (input), "+D" (output), "+a" (iv)

		      : "d" (control_word), "b" (key), "c" (count-initial));

		      : "d" (control_word), "b" (key), "c" (count));

	return iv;

}

drivers/gpu/drm/vc4/vc4_plane.c

+3 −0
Original line number Diff line number Diff line
@@ -350,6 +350,9 @@ static int vc4_plane_setup_clipping_and_scaling(struct drm_plane_state *state) 
			vc4_state->x_scaling[0] = VC4_SCALING_TPZ;

		if (vc4_state->y_scaling[0] == VC4_SCALING_NONE)

			vc4_state->y_scaling[0] = VC4_SCALING_TPZ;

	} else {

		vc4_state->x_scaling[1] = VC4_SCALING_NONE;

		vc4_state->y_scaling[1] = VC4_SCALING_NONE;

	}



	vc4_state->is_unity = (vc4_state->x_scaling[0] == VC4_SCALING_NONE &&

drivers/net/bonding/bond_main.c

+12 −2
Original line number Diff line number Diff line
@@ -1682,6 +1682,8 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) 
		goto err_upper_unlink;

	}



	bond->nest_level = dev_get_nest_level(bond_dev) + 1;



	/* If the mode uses primary, then the following is handled by

	 * bond_change_active_slave().

	 */
@@ -1729,7 +1731,6 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) 
	if (bond_mode_uses_xmit_hash(bond))

		bond_update_slave_arr(bond, NULL);



	bond->nest_level = dev_get_nest_level(bond_dev);



	netdev_info(bond_dev, "Enslaving %s as %s interface with %s link\n",

		    slave_dev->name,
@@ -3359,6 +3360,13 @@ static void bond_fold_stats(struct rtnl_link_stats64 *_res, 
	}

}



static int bond_get_nest_level(struct net_device *bond_dev)

{

	struct bonding *bond = netdev_priv(bond_dev);



	return bond->nest_level;

}



static struct rtnl_link_stats64 *bond_get_stats(struct net_device *bond_dev,

						struct rtnl_link_stats64 *stats)

{
@@ -3367,7 +3375,7 @@ static struct rtnl_link_stats64 *bond_get_stats(struct net_device *bond_dev, 
	struct list_head *iter;

	struct slave *slave;



	spin_lock(&bond->stats_lock);

	spin_lock_nested(&bond->stats_lock, bond_get_nest_level(bond_dev));

	memcpy(stats, &bond->bond_stats, sizeof(*stats));



	rcu_read_lock();
@@ -4163,6 +4171,7 @@ static const struct net_device_ops bond_netdev_ops = { 
	.ndo_neigh_setup	= bond_neigh_setup,

	.ndo_vlan_rx_add_vid	= bond_vlan_rx_add_vid,

	.ndo_vlan_rx_kill_vid	= bond_vlan_rx_kill_vid,

	.ndo_get_lock_subclass  = bond_get_nest_level,

#ifdef CONFIG_NET_POLL_CONTROLLER

	.ndo_netpoll_setup	= bond_netpoll_setup,

	.ndo_netpoll_cleanup	= bond_netpoll_cleanup,
@@ -4655,6 +4664,7 @@ static int bond_init(struct net_device *bond_dev) 
	if (!bond->wq)

		return -ENOMEM;



	bond->nest_level = SINGLE_DEPTH_NESTING;

	netdev_lockdep_set_classes(bond_dev);



	list_add_tail(&bond->bond_list, &bn->dev_list);