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

Unverified Commit ff0f1c27 authored by derfelot's avatar derfelot
Browse files

Merge Linux 4.4.234 kernel 

Changes in 4.4.234: (35 commits)
        drm/imx: imx-ldb: Disable both channels for split mode in enc->disable()
        perf probe: Fix memory leakage when the probe point is not found
        net/compat: Add missing sock updates for SCM_RIGHTS
        watchdog: f71808e_wdt: indicate WDIOF_CARDRESET support in watchdog_info.options
        watchdog: f71808e_wdt: remove use of wrong watchdog_info option
        coredump: fix race condition between collapse_huge_page() and core dumping
        khugepaged: khugepaged_test_exit() check mmget_still_valid()
        khugepaged: adjust VM_BUG_ON_MM() in __khugepaged_enter()
        btrfs: export helpers for subvolume name/id resolution
        btrfs: don't show full path of bind mounts in subvol=
        romfs: fix uninitialized memory leak in romfs_dev_read()
        mm: include CMA pages in lowmem_reserve at boot
        mm, page_alloc: fix core hung in free_pcppages_bulk()
        ext4: clean up ext4_match() and callers
        ext4: fix checking of directory entry validity for inline directories
        media: budget-core: Improve exception handling in budget_register()
        media: vpss: clean up resources in init
        Input: psmouse - add a newline when printing 'proto' by sysfs
        m68knommu: fix overwriting of bits in ColdFire V3 cache control
        xfs: fix inode quota reservation checks
        jffs2: fix UAF problem
        scsi: libfc: Free skb in fc_disc_gpn_id_resp() for valid cases
        virtio_ring: Avoid loop when vq is broken in virtqueue_poll
        xfs: Fix UBSAN null-ptr-deref in xfs_sysfs_init
        alpha: fix annotation of io{read,write}{16,32}be()
        ext4: fix potential negative array index in do_split()
        ASoC: intel: Fix memleak in sst_media_open
        powerpc: Allow 4224 bytes of stack expansion for the signal frame
        epoll: Keep a reference on files added to the check list
        do_epoll_ctl(): clean the failure exits up a bit
        mm/hugetlb: fix calculation of adjust_range_if_pmd_sharing_possible
        xen: don't reschedule in preemption off sections
        omapfb: dss: Fix max fclk divider for omap36xx
        KVM: arm/arm64: Don't reschedule in unmap_stage2_range()
        Linux 4.4.234
parents c177ab98 61b7ab35

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 233

SUBLEVEL = 234

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/alpha/include/asm/io.h

+4 −4
Original line number Diff line number Diff line
@@ -491,10 +491,10 @@ extern inline void writeq(u64 b, volatile void __iomem *addr) 
}

#endif



#define ioread16be(p) be16_to_cpu(ioread16(p))

#define ioread32be(p) be32_to_cpu(ioread32(p))

#define iowrite16be(v,p) iowrite16(cpu_to_be16(v), (p))

#define iowrite32be(v,p) iowrite32(cpu_to_be32(v), (p))

#define ioread16be(p) swab16(ioread16(p))

#define ioread32be(p) swab32(ioread32(p))

#define iowrite16be(v,p) iowrite16(swab16(v), (p))

#define iowrite32be(v,p) iowrite32(swab32(v), (p))



#define inb_p		inb

#define inw_p		inw

arch/arm/kvm/mmu.c

+0 −8
Original line number Diff line number Diff line
@@ -301,14 +301,6 @@ static void unmap_range(struct kvm *kvm, pgd_t *pgdp, 
		next = kvm_pgd_addr_end(addr, end);

		if (!pgd_none(*pgd))

			unmap_puds(kvm, pgd, addr, next);

		/*

		 * If we are dealing with a large range in

		 * stage2 table, release the kvm->mmu_lock

		 * to prevent starvation and lockup detector

		 * warnings.

		 */

		if (kvm && (next != end))

			cond_resched_lock(&kvm->mmu_lock);

	} while (pgd++, addr = next, addr != end);

}

arch/m68k/include/asm/m53xxacr.h

+3 −3
Original line number Diff line number Diff line
@@ -88,9 +88,9 @@ 
 * coherency though in all cases. And for copyback caches we will need

 * to push cached data as well.

 */

#define CACHE_INIT	  CACR_CINVA

#define CACHE_INVALIDATE  CACR_CINVA

#define CACHE_INVALIDATED CACR_CINVA

#define CACHE_INIT        (CACHE_MODE + CACR_CINVA - CACR_EC)

#define CACHE_INVALIDATE  (CACHE_MODE + CACR_CINVA)

#define CACHE_INVALIDATED (CACHE_MODE + CACR_CINVA)



#define ACR0_MODE	((CONFIG_RAMBASE & 0xff000000) + \

			 (0x000f0000) + \

arch/powerpc/mm/fault.c

+5 −2
Original line number Diff line number Diff line
@@ -192,6 +192,9 @@ static int mm_fault_error(struct pt_regs *regs, unsigned long addr, int fault) 
	return MM_FAULT_CONTINUE;

}



// This comes from 64-bit struct rt_sigframe + __SIGNAL_FRAMESIZE

#define SIGFRAME_MAX_SIZE	(4096 + 128)



/*

 * For 600- and 800-family processors, the error_code parameter is DSISR

 * for a data fault, SRR1 for an instruction fault. For 400-family processors
@@ -341,7 +344,7 @@ retry: 
	/*

	 * N.B. The POWER/Open ABI allows programs to access up to

	 * 288 bytes below the stack pointer.

	 * The kernel signal delivery code writes up to about 1.5kB

	 * The kernel signal delivery code writes up to about 4kB

	 * below the stack pointer (r1) before decrementing it.

	 * The exec code can write slightly over 640kB to the stack

	 * before setting the user r1.  Thus we allow the stack to
@@ -365,7 +368,7 @@ retry: 
		 * between the last mapped region and the stack will

		 * expand the stack rather than segfaulting.

		 */

		if (address + 2048 < uregs->gpr[1] && !store_update_sp)

		if (address + SIGFRAME_MAX_SIZE < uregs->gpr[1] && !store_update_sp)

			goto bad_area;

	}

	if (expand_stack(vma, address))