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

Commit 5524e0ef authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 3.18.99 into android-3.18 



Changes in 3.18.99
	tpm_i2c_infineon: fix potential buffer overruns caused by bit glitches on the bus
	tpm_i2c_nuvoton: fix potential buffer overruns caused by bit glitches on the bus
	ALSA: usb-audio: Add a quirck for B&W PX headphones
	cpufreq: s3c24xx: Fix broken s3c_cpufreq_init()
	ARM: mvebu: Fix broken PL310_ERRATA_753970 selects
	net: fec: introduce fec_ptp_stop and use in probe fail path
	leds: do not overflow sysfs buffer in led_trigger_show
	bridge: check brport attr show in brport_show
	hdlc_ppp: carrier detect ok, don't turn off negotiation
	ipv6 sit: work around bogus gcc-8 -Wrestrict warning
	net: fix race on decreasing number of TX queues
	netlink: ensure to loop over all netns in genlmsg_multicast_allns()
	ppp: prevent unregistered channels from connecting to PPP units
	udplite: fix partial checksum initialization
	sctp: fix dst refcnt leak in sctp_v6_get_dst()
	s390/qeth: fix SETIP command handling
	s390/qeth: fix IPA command submission race
	sctp: verify size of a new chunk in _sctp_make_chunk()
	net: ipv4: don't allow setting net.ipv4.route.min_pmtu below 68
	fib_semantics: Don't match route with mismatching tclassid
	dm io: fix duplicate bio completion due to missing ref count
	Linux 3.18.99

Change-Id: I4ab9fb6e2ba39def508fd0d3de055adf4ae81c95
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents d66113e8 89dad4ea

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 98

SUBLEVEL = 99

EXTRAVERSION =

NAME = Diseased Newt

arch/arm/mach-mvebu/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ config MACH_ARMADA_370 
config MACH_ARMADA_375

	bool "Marvell Armada 375 boards" if ARCH_MULTI_V7

	select ARM_ERRATA_720789

	select ARM_ERRATA_753970

	select PL310_ERRATA_753970

	select ARM_GIC

	select ARMADA_375_CLK

	select HAVE_ARM_SCU
@@ -52,7 +52,7 @@ config MACH_ARMADA_375 
config MACH_ARMADA_38X

	bool "Marvell Armada 380/385 boards" if ARCH_MULTI_V7

	select ARM_ERRATA_720789

	select ARM_ERRATA_753970

	select PL310_ERRATA_753970

	select ARM_GIC

	select ARMADA_38X_CLK

	select HAVE_ARM_SCU

drivers/char/tpm/tpm_i2c_infineon.c

+3 −2
Original line number Diff line number Diff line
@@ -436,7 +436,8 @@ static int recv_data(struct tpm_chip *chip, u8 *buf, size_t count) 
static int tpm_tis_i2c_recv(struct tpm_chip *chip, u8 *buf, size_t count)

{

	int size = 0;

	int expected, status;

	int status;

	u32 expected;



	if (count < TPM_HEADER_SIZE) {

		size = -EIO;
@@ -451,7 +452,7 @@ static int tpm_tis_i2c_recv(struct tpm_chip *chip, u8 *buf, size_t count) 
	}



	expected = be32_to_cpu(*(__be32 *)(buf + 2));

	if ((size_t) expected > count) {

	if (((size_t) expected > count) || (expected < TPM_HEADER_SIZE)) {

		size = -EIO;

		goto out;

	}

drivers/char/tpm/tpm_i2c_nuvoton.c

+6 −2
Original line number Diff line number Diff line
@@ -267,7 +267,11 @@ static int i2c_nuvoton_recv(struct tpm_chip *chip, u8 *buf, size_t count) 
	struct device *dev = chip->dev;

	struct i2c_client *client = to_i2c_client(dev);

	s32 rc;

	int expected, status, burst_count, retries, size = 0;

	int status;

	int burst_count;

	int retries;

	int size = 0;

	u32 expected;



	if (count < TPM_HEADER_SIZE) {

		i2c_nuvoton_ready(chip);    /* return to idle */
@@ -309,7 +313,7 @@ static int i2c_nuvoton_recv(struct tpm_chip *chip, u8 *buf, size_t count) 
		 * to machine native

		 */

		expected = be32_to_cpu(*(__be32 *) (buf + 2));

		if (expected > count) {

		if (expected > count || expected < size) {

			dev_err(dev, "%s() expected > count\n", __func__);

			size = -EIO;

			continue;

drivers/cpufreq/s3c24xx-cpufreq.c

+7 −1
Original line number Diff line number Diff line
@@ -364,7 +364,13 @@ struct clk *s3c_cpufreq_clk_get(struct device *dev, const char *name) 
static int s3c_cpufreq_init(struct cpufreq_policy *policy)

{

	policy->clk = clk_arm;

	return cpufreq_generic_init(policy, ftab, cpu_cur.info->latency);



	policy->cpuinfo.transition_latency = cpu_cur.info->latency;



	if (ftab)

		return cpufreq_table_validate_and_show(policy, ftab);



	return 0;

}



static int __init s3c_cpufreq_initclks(void)