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

Unverified Commit 8ee9de4d authored by derfelot's avatar derfelot
Browse files

Merge Linux 4.4.235 kernel

Changes in 4.4.235: (62 commits)
        net: Fix potential wrong skb->protocol in skb_vlan_untag()
        tipc: fix uninit skb->data in tipc_nl_compat_dumpit()
        ipvlan: fix device features
        bonding: show saner speed for broadcast mode
        bonding: fix a potential double-unregister
        powerpc/pseries: Do not initiate shutdown when system is running on UPS
        ALSA: pci: delete repeated words in comments
        ASoC: tegra: Fix reference count leaks.
        media: pci: ttpci: av7110: fix possible buffer overflow caused by bad DMA value in debiirq()
        scsi: target: tcmu: Fix crash on ARM during cmd completion
        drm/amdkfd: Fix reference count leaks.
        drm/radeon: fix multiple reference count leak
        drm/amdgpu: fix ref count leak in amdgpu_driver_open_kms
        drm/amd/display: fix ref count leak in amdgpu_drm_ioctl
        drm/amdgpu: fix ref count leak in amdgpu_display_crtc_set_config
        drm/amdgpu/display: fix ref count leak when pm_runtime_get_sync fails
        scsi: lpfc: Fix shost refcount mismatch when deleting vport
        selftests/powerpc: Purge extra count_pmc() calls of ebb selftests
        PCI: Fix pci_create_slot() reference count leak
        rtlwifi: rtl8192cu: Prevent leaking urb
        mips/vdso: Fix resource leaks in genvdso.c
        drm/nouveau/drm/noveau: fix reference count leak in nouveau_fbcon_open
        drm/nouveau: Fix reference count leak in nouveau_connector_detect
        locking/lockdep: Fix overflow in presentation of average lock-time
        scsi: iscsi: Do not put host in iscsi_set_flashnode_param()
        ceph: fix potential mdsc use-after-free crash
        scsi: fcoe: Memory leak fix in fcoe_sysfs_fcf_del()
        EDAC/ie31200: Fallback if host bridge device is already initialized
        media: davinci: vpif_capture: fix potential double free
        powerpc/spufs: add CONFIG_COREDUMP dependency
        USB: sisusbvga: Fix a potential UB casued by left shifting a negative value
        Revert "ath10k: fix DMA related firmware crashes on multiple devices"
        i2c: rcar: in slave mode, clear NACK earlier
        jbd2: make sure jh have b_transaction set in refile/unfile_buffer
        jbd2: abort journal if free a async write error metadata buffer
        s390/cio: add cond_resched() in the slow_eval_known_fn() loop
        scsi: ufs: Fix possible infinite loop in ufshcd_hold
        net: gianfar: Add of_node_put() before goto statement
        fbcon: prevent user font height or width change from causing potential out-of-bounds access
        USB: lvtest: return proper error code in probe
        vt: defer kfree() of vc_screenbuf in vc_do_resize()
        vt_ioctl: change VT_RESIZEX ioctl to check for error return from vc_resize()
        serial: samsung: Removes the IRQ not found warning
        serial: pl011: Don't leak amba_ports entry on driver register error
        serial: 8250: change lock order in serial8250_do_startup()
        writeback: Protect inode->i_io_list with inode->i_lock
        writeback: Avoid skipping inode writeback
        writeback: Fix sync livelock due to b_dirty_time processing
        XEN uses irqdesc::irq_data_common::handler_data to store a per interrupt XEN data pointer which contains XEN specific information.
        xhci: Do warm-reset when both CAS and XDEV_RESUME are set
        PM: sleep: core: Fix the handling of pending runtime resume requests
        device property: Fix the secondary firmware node handling in set_primary_fwnode()
        USB: yurex: Fix bad gfp argument
        usb: uas: Add quirk for PNY Pro Elite
        USB: quirks: Add no-lpm quirk for another Raydium touchscreen
        USB: Ignore UAS for JMicron JMS567 ATA/ATAPI Bridge
        usb: host: ohci-exynos: Fix error handling in exynos_ohci_probe()
        usb: storage: Add unusual_uas entry for Sony PSZ drives
        btrfs: check the right error variable in btrfs_del_dir_entries_in_log
        HID: hiddev: Fix slab-out-of-bounds write in hiddev_ioctl_usage()
        ALSA: usb-audio: Update documentation comment for MS2109 quirk
        Linux 4.4.235

Conflicts:
	drivers/scsi/ufs/ufshcd.c
parents ff0f1c27 aafe1339
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
VERSION = 4
PATCHLEVEL = 4
SUBLEVEL = 234
SUBLEVEL = 235
EXTRAVERSION =
NAME = Blurry Fish Butt

+10 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ static void *map_vdso(const char *path, size_t *_size)
	if (fstat(fd, &stat) != 0) {
		fprintf(stderr, "%s: Failed to stat '%s': %s\n", program_name,
			path, strerror(errno));
		close(fd);
		return NULL;
	}

@@ -134,6 +135,7 @@ static void *map_vdso(const char *path, size_t *_size)
	if (addr == MAP_FAILED) {
		fprintf(stderr, "%s: Failed to map '%s': %s\n", program_name,
			path, strerror(errno));
		close(fd);
		return NULL;
	}

@@ -143,6 +145,7 @@ static void *map_vdso(const char *path, size_t *_size)
	if (memcmp(ehdr->e_ident, ELFMAG, SELFMAG) != 0) {
		fprintf(stderr, "%s: '%s' is not an ELF file\n", program_name,
			path);
		close(fd);
		return NULL;
	}

@@ -154,6 +157,7 @@ static void *map_vdso(const char *path, size_t *_size)
	default:
		fprintf(stderr, "%s: '%s' has invalid ELF class\n",
			program_name, path);
		close(fd);
		return NULL;
	}

@@ -165,6 +169,7 @@ static void *map_vdso(const char *path, size_t *_size)
	default:
		fprintf(stderr, "%s: '%s' has invalid ELF data order\n",
			program_name, path);
		close(fd);
		return NULL;
	}

@@ -172,15 +177,18 @@ static void *map_vdso(const char *path, size_t *_size)
		fprintf(stderr,
			"%s: '%s' has invalid ELF machine (expected EM_MIPS)\n",
			program_name, path);
		close(fd);
		return NULL;
	} else if (swap_uint16(ehdr->e_type) != ET_DYN) {
		fprintf(stderr,
			"%s: '%s' has invalid ELF type (expected ET_DYN)\n",
			program_name, path);
		close(fd);
		return NULL;
	}

	*_size = stat.st_size;
	close(fd);
	return addr;
}

@@ -284,10 +292,12 @@ int main(int argc, char **argv)
	/* Calculate and write symbol offsets to <output file> */
	if (!get_symbols(dbg_vdso_path, dbg_vdso)) {
		unlink(out_path);
		fclose(out_file);
		return EXIT_FAILURE;
	}

	fprintf(out_file, "};\n");
	fclose(out_file);

	return EXIT_SUCCESS;
}
+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ config SPU_FS
	tristate "SPU file system"
	default m
	depends on PPC_CELL
	depends on COREDUMP
	select SPU_BASE
	select MEMORY_HOTPLUG
	help
+0 −1
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ static void handle_system_shutdown(char event_modifier)
		pr_emerg("Loss of power reported by firmware, system is "
			"running on UPS/battery");
		pr_emerg("Check RTAS error log for details");
		orderly_poweroff(true);
		break;

	case EPOW_SHUTDOWN_LOSS_OF_CRITICAL_FUNCTIONS:
+8 −4
Original line number Diff line number Diff line
@@ -2349,17 +2349,21 @@ static inline bool fwnode_is_primary(struct fwnode_handle *fwnode)
 */
void set_primary_fwnode(struct device *dev, struct fwnode_handle *fwnode)
{
	if (fwnode) {
	struct fwnode_handle *fn = dev->fwnode;

	if (fwnode) {
		if (fwnode_is_primary(fn))
			fn = fn->secondary;

		fwnode->secondary = fn;
		dev->fwnode = fwnode;
	} else {
		dev->fwnode = fwnode_is_primary(dev->fwnode) ?
			dev->fwnode->secondary : NULL;
		if (fwnode_is_primary(fn)) {
			dev->fwnode = fn->secondary;
			fn->secondary = NULL;
		} else {
			dev->fwnode = NULL;
		}
	}
}
EXPORT_SYMBOL_GPL(set_primary_fwnode);
Loading