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

Commit 65f1d995 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.9.230 into android-4.9-q 



Changes in 4.9.230
	btrfs: fix a block group ref counter leak after failure to remove block group
	btrfs: cow_file_range() num_bytes and disk_num_bytes are same
	btrfs: fix data block group relocation failure due to concurrent scrub
	mm: fix swap cache node allocation mask
	EDAC/amd64: Read back the scrub rate PCI register on F15h
	usbnet: smsc95xx: Fix use-after-free after removal
	mm/slub.c: fix corrupted freechain in deactivate_slab()
	mm/slub: fix stack overruns with SLUB_STATS
	usb: usbtest: fix missing kfree(dev->buf) in usbtest_disconnect
	kgdb: Avoid suspicious RCU usage warning
	crypto: af_alg - fix use-after-free in af_alg_accept() due to bh_lock_sock()
	sched/rt: Show the 'sched_rr_timeslice' SCHED_RR timeslice tuning knob in milliseconds
	cxgb4: parse TC-U32 key values and masks natively
	hwmon: (max6697) Make sure the OVERT mask is set correctly
	hwmon: (acpi_power_meter) Fix potential memory leak in acpi_power_meter_add()
	virtio-blk: free vblk-vqs in error path of virtblk_probe()
	i2c: algo-pca: Add 0x78 as SCL stuck low status for PCA9665
	Revert "ALSA: usb-audio: Improve frames size computation"
	SMB3: Honor 'seal' flag for multiuser mounts
	SMB3: Honor persistent/resilient handle flags for multiuser mounts
	cifs: Fix the target file was deleted when rename failed.
	MIPS: Add missing EHB in mtc0 -> mfc0 sequence for DSPen
	netfilter: nf_conntrack_h323: lost .data_len definition for Q.931/ipv6
	efi: Make it possible to disable efivar_ssdt entirely
	Linux 4.9.230

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Idfb59ec0247f0e8ba270f56daa689ee6f68d54bc
parents 6e60c655 eb5d9558

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 229

SUBLEVEL = 230

EXTRAVERSION =

NAME = Roaring Lionus

arch/mips/kernel/traps.c

+1 −0
Original line number Diff line number Diff line
@@ -2137,6 +2137,7 @@ static void configure_status(void) 


	change_c0_status(ST0_CU|ST0_MX|ST0_RE|ST0_FR|ST0_BEV|ST0_TS|ST0_KX|ST0_SX|ST0_UX,

			 status_set);

	back_to_back_c0_hazard();

}



unsigned int hwrena;

crypto/af_alg.c

+11 −15
Original line number Diff line number Diff line
@@ -130,21 +130,15 @@ EXPORT_SYMBOL_GPL(af_alg_release); 
void af_alg_release_parent(struct sock *sk)

{

	struct alg_sock *ask = alg_sk(sk);

	unsigned int nokey = ask->nokey_refcnt;

	bool last = nokey && !ask->refcnt;

	unsigned int nokey = atomic_read(&ask->nokey_refcnt);



	sk = ask->parent;

	ask = alg_sk(sk);



	local_bh_disable();

	bh_lock_sock(sk);

	ask->nokey_refcnt -= nokey;

	if (!last)

		last = !--ask->refcnt;

	bh_unlock_sock(sk);

	local_bh_enable();

	if (nokey)

		atomic_dec(&ask->nokey_refcnt);



	if (last)

	if (atomic_dec_and_test(&ask->refcnt))

		sock_put(sk);

}

EXPORT_SYMBOL_GPL(af_alg_release_parent);
@@ -189,7 +183,7 @@ static int alg_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) 


	err = -EBUSY;

	lock_sock(sk);

	if (ask->refcnt | ask->nokey_refcnt)

	if (atomic_read(&ask->refcnt))

		goto unlock;



	swap(ask->type, type);
@@ -238,7 +232,7 @@ static int alg_setsockopt(struct socket *sock, int level, int optname, 
	int err = -EBUSY;



	lock_sock(sk);

	if (ask->refcnt)

	if (atomic_read(&ask->refcnt) != atomic_read(&ask->nokey_refcnt))

		goto unlock;



	type = ask->type;
@@ -305,12 +299,14 @@ int af_alg_accept(struct sock *sk, struct socket *newsock) 


	sk2->sk_family = PF_ALG;



	if (nokey || !ask->refcnt++)

	if (atomic_inc_return_relaxed(&ask->refcnt) == 1)

		sock_hold(sk);

	ask->nokey_refcnt += nokey;

	if (nokey) {

		atomic_inc(&ask->nokey_refcnt);

		atomic_set(&alg_sk(sk2)->nokey_refcnt, 1);

	}

	alg_sk(sk2)->parent = sk;

	alg_sk(sk2)->type = type;

	alg_sk(sk2)->nokey_refcnt = nokey;



	newsock->ops = type->ops;

	newsock->state = SS_CONNECTED;

crypto/algif_aead.c

+3 −6
Original line number Diff line number Diff line
@@ -747,7 +747,7 @@ static int aead_check_key(struct socket *sock) 
	struct alg_sock *ask = alg_sk(sk);



	lock_sock(sk);

	if (ask->refcnt)

	if (!atomic_read(&ask->nokey_refcnt))

		goto unlock_child;



	psk = ask->parent;
@@ -759,11 +759,8 @@ static int aead_check_key(struct socket *sock) 
	if (!tfm->has_key)

		goto unlock;



	if (!pask->refcnt++)

		sock_hold(psk);



	ask->refcnt = 1;

	sock_put(psk);

	atomic_dec(&pask->nokey_refcnt);

	atomic_set(&ask->nokey_refcnt, 0);



	err = 0;

crypto/algif_hash.c

+3 −6
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ static int hash_check_key(struct socket *sock) 
	struct alg_sock *ask = alg_sk(sk);



	lock_sock(sk);

	if (ask->refcnt)

	if (!atomic_read(&ask->nokey_refcnt))

		goto unlock_child;



	psk = ask->parent;
@@ -320,11 +320,8 @@ static int hash_check_key(struct socket *sock) 
	if (crypto_ahash_get_flags(tfm) & CRYPTO_TFM_NEED_KEY)

		goto unlock;



	if (!pask->refcnt++)

		sock_hold(psk);



	ask->refcnt = 1;

	sock_put(psk);

	atomic_dec(&pask->nokey_refcnt);

	atomic_set(&ask->nokey_refcnt, 0);



	err = 0;