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

Unverified Commit 90fdb5aa authored by derfelot's avatar derfelot
Browse files

Merge Linux 4.4.270 kernel 

Changes in 4.4.270: (33 commits)
        openrisc: Fix a memory leak
        scsi: qla2xxx: Fix error return code in qla82xx_write_flash_dword()
        ptrace: make ptrace() fail if the tracee changed its pid unexpectedly
        cifs: fix memory leak in smb2_copychunk_range
        ALSA: usb-audio: Validate MS endpoint descriptors
        ALSA: bebob/oxfw: fix Kconfig entry for Mackie d.2 Pro
        Revert "ALSA: sb8: add a check for request_region"
        xen-pciback: reconfigure also from backend watch handler
        dm snapshot: fix crash with transient storage and zero chunk size
        Revert "video: hgafb: fix potential NULL pointer dereference"
        Revert "net: stmicro: fix a missing check of clk_prepare"
        Revert "leds: lp5523: fix a missing check of return value of lp55xx_read"
        Revert "hwmon: (lm80) fix a missing check of bus read in lm80 probe"
        Revert "video: imsttfb: fix potential NULL pointer dereferences"
        Revert "ecryptfs: replace BUG_ON with error handling code"
        Revert "gdrom: fix a memory leak bug"
        cdrom: gdrom: deallocate struct gdrom_unit fields in remove_gdrom
        cdrom: gdrom: initialize global variable at init time
        Revert "rtlwifi: fix a potential NULL pointer dereference"
        Revert "qlcnic: Avoid potential NULL pointer dereference"
        Revert "niu: fix missing checks of niu_pci_eeprom_read"
        ethernet: sun: niu: fix missing checks of niu_pci_eeprom_read()
        net: stmicro: handle clk_prepare() failure during init
        net: rtlwifi: properly check for alloc_workqueue() failure
        leds: lp5523: check return value of lp5xx_read and jump to cleanup code
        qlcnic: Add null check after calling netdev_alloc_skb
        video: hgafb: fix potential NULL pointer dereference
        vgacon: Record video mode changes with VT_RESIZEX
        vt: Fix character height handling with VT_RESIZEX
        tty: vt: always invoke vc->vc_sw->con_resize callback
        video: hgafb: correctly handle card detect failure during probe
        Bluetooth: SMP: Fail if remote and local public keys are identical
        Linux 4.4.270
parents 2d8b4580 adec72d8

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 269

SUBLEVEL = 270

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/openrisc/kernel/setup.c

+2 −0
Original line number Diff line number Diff line
@@ -278,6 +278,8 @@ void calibrate_delay(void) 
	pr_cont("%lu.%02lu BogoMIPS (lpj=%lu)\n",

		loops_per_jiffy / (500000 / HZ),

		(loops_per_jiffy / (5000 / HZ)) % 100, loops_per_jiffy);



	of_node_put(cpu);

}



void __init setup_arch(char **cmdline_p)

drivers/cdrom/gdrom.c

+10 −3
Original line number Diff line number Diff line
@@ -773,6 +773,13 @@ static int probe_gdrom_setupqueue(void) 
static int probe_gdrom(struct platform_device *devptr)

{

	int err;



	/*

	 * Ensure our "one" device is initialized properly in case of previous

	 * usages of it

	 */

	memset(&gd, 0, sizeof(gd));



	/* Start the device */

	if (gdrom_execute_diagnostic() != 1) {

		pr_warning("ATA Probe for GDROM failed\n");
@@ -850,6 +857,8 @@ static int remove_gdrom(struct platform_device *devptr) 
	if (gdrom_major)

		unregister_blkdev(gdrom_major, GDROM_DEV_NAME);

	unregister_cdrom(gd.cd_info);

	kfree(gd.cd_info);

	kfree(gd.toc);



	return 0;

}
@@ -865,7 +874,7 @@ static struct platform_driver gdrom_driver = { 
static int __init init_gdrom(void)

{

	int rc;

	gd.toc = NULL;



	rc = platform_driver_register(&gdrom_driver);

	if (rc)

		return rc;
@@ -881,8 +890,6 @@ static void __exit exit_gdrom(void) 
{

	platform_device_unregister(pd);

	platform_driver_unregister(&gdrom_driver);

	kfree(gd.toc);

	kfree(gd.cd_info);

}



module_init(init_gdrom);

drivers/hwmon/lm80.c

+2 −9
Original line number Diff line number Diff line
@@ -630,7 +630,6 @@ static int lm80_probe(struct i2c_client *client, 
	struct device *dev = &client->dev;

	struct device *hwmon_dev;

	struct lm80_data *data;

	int rv;



	data = devm_kzalloc(dev, sizeof(struct lm80_data), GFP_KERNEL);

	if (!data)
@@ -643,14 +642,8 @@ static int lm80_probe(struct i2c_client *client, 
	lm80_init_client(client);



	/* A few vars need to be filled upon startup */

	rv = lm80_read_value(client, LM80_REG_FAN_MIN(1));

	if (rv < 0)

		return rv;

	data->fan[f_min][0] = rv;

	rv = lm80_read_value(client, LM80_REG_FAN_MIN(2));

	if (rv < 0)

		return rv;

	data->fan[f_min][1] = rv;

	data->fan[f_min][0] = lm80_read_value(client, LM80_REG_FAN_MIN(1));

	data->fan[f_min][1] = lm80_read_value(client, LM80_REG_FAN_MIN(2));



	hwmon_dev = devm_hwmon_device_register_with_groups(dev, client->name,

							   data, lm80_groups);

drivers/leds/leds-lp5523.c

+1 −1
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ static int lp5523_init_program_engine(struct lp55xx_chip *chip) 
	usleep_range(3000, 6000);

	ret = lp55xx_read(chip, LP5523_REG_STATUS, &status);

	if (ret)

		return ret;

		goto out;

	status &= LP5523_ENG_STATUS_MASK;



	if (status != LP5523_ENG_STATUS_MASK) {