Linux 4.4.18
Greg KH
maintainerI'm announcing the release of the 4.4.18 kernel.
All users of the 4.4 kernel series must upgrade.
The updated 4.4.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.4.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/x86/pat.txt | 32 ++++++ Makefile | 2 arch/arm/kernel/sys_oabi-compat.c | 8 + arch/mips/kernel/scall64-n32.S | 2 arch/mips/kernel/scall64-o32.S | 2 arch/s390/kernel/ipl.c | 7 - arch/x86/entry/syscalls/syscall_32.tbl | 2 arch/x86/include/asm/mtrr.h | 6 - arch/x86/include/asm/pat.h | 2 arch/x86/kernel/cpu/mtrr/generic.c | 24 ++-- arch/x86/kernel/cpu/mtrr/main.c | 13 ++ arch/x86/kernel/cpu/mtrr/mtrr.h | 1 arch/x86/mm/mmap.c | 14 -- arch/x86/mm/pat.c | 109 +++++++++++++-------- arch/x86/xen/enlighten.c | 9 - block/genhd.c | 1 crypto/gcm.c | 4 crypto/scatterwalk.c | 3 drivers/char/random.c | 13 +- drivers/gpu/drm/i915/intel_pm.c | 14 +- drivers/hid/hid-sony.c | 6 - drivers/i2c/busses/i2c-i801.c | 103 ++++++++++++++++++-- drivers/net/bonding/bond_netlink.c | 6 - drivers/net/ethernet/broadcom/bgmac.c | 2 drivers/net/ethernet/qlogic/qed/qed_spq.c | 7 - drivers/net/usb/cdc_ncm.c | 20 --- drivers/pnp/quirks.c | 2 drivers/scsi/scsi_sysfs.c | 7 - drivers/staging/rdma/ipath/ipath_file_ops.c | 5 drivers/tty/pty.c | 63 +++++------- fs/dcache.c | 7 - fs/devpts/inode.c | 49 ++++----- fs/ext4/balloc.c | 3 fs/ext4/extents.c | 8 + fs/ext4/inode.c | 35 +++++- fs/ext4/mballoc.c | 17 --- fs/ext4/super.c | 17 +++ fs/fuse/file.c | 24 ++++ fs/fuse/inode.c | 2 include/linux/devpts_fs.h | 34 +----- include/linux/memcontrol.h | 8 + ipc/msg.c | 2 ipc/sem.c | 12 +- mm/memcontrol.c | 142 +++++++++++++++++++++++----- mm/slab_common.c | 4 net/ipv4/fib_semantics.c | 6 + net/ipv4/tcp_input.c | 54 ++++++---- net/ipv4/tcp_output.c | 3 net/irda/af_irda.c | 7 - security/apparmor/apparmorfs.c | 1 50 files changed, 623 insertions(+), 301 deletions(-)
Alexey Kuznetsov (1):
fuse: fsync() did not return IO errors
Ben Hutchings (1):
ipath: Restrict use of the write() interface
Beniamino Galvani (1):
bonding: set carrier off for devices created through netlink
Benjamin Tissoires (1):
HID: sony: do not bail out when the sixaxis refuses the output report
Bjørn Mork (1):
cdc_ncm: do not call usbnet_link_change from cdc_ncm_bind
Christophe Le Roy (1):
PNP: Add Broadwell to Intel MCH size workaround
Dave Weinstein (1):
arm: oabi compat: add missing access checks
David Howells (2):
KEYS: 64-bit MIPS needs to use compat_sys_keyctl for 32-bit userspace x86/syscalls/64: Add compat_sys_keyctl for 32-bit userspace
Eric Dumazet (1):
tcp: make challenge acks less predictable
Fabian Frederick (1):
sysv, ipc: fix security-layer leaking
Florian Fainelli (1):
net: bgmac: Fix infinite loop in bgmac_dma_tx_add()
Greg Kroah-Hartman (1):
Linux 4.4.18
Hannes Reinecke (1):
scsi: ignore errors from scsi_dh_add_device()
Hector Marco-Gisbert (1):
x86/mm/32: Enable full randomization on i386 and X86_32
Herbert Xu (2):
crypto: gcm - Filter out async ghash if necessary
crypto: scatterwalk - Fix test in scatterwalk_done
Jan Kara (1):
ext4: fix deadlock during page writeback
Jason Baron (1):
tcp: enable per-socket rate limiting of all 'challenge acks'
Johannes Weiner (1):
mm: memcontrol: fix cgroup creation failure after many small jobs
John Johansen (1):
apparmor: fix ref count leak when profile sha1 hash is read
Josh Boyer (1):
PNP: Add Haswell-ULT to Intel MCH size workaround
Julian Anastasov (1):
ipv4: reject RTNH_F_DEAD and RTNH_F_LINKDOWN from user space
Linus Torvalds (1):
devpts: clean up interface to pty drivers
Manish Chopra (1):
qed: Fix setting/clearing bit in completion bitmap
Matt Roper (1):
drm/i915: Pretend cursor is always on for ILK-style WM calculations (v2)
Maxim Patlasov (1):
fuse: fuse_flush must check mapping->flags for errors
Michael Holzheu (1):
Revert "s390/kdump: Clear subchannel ID to signal non-CCW/SCSI IPL"
Mika Westerberg (1):
i2c: i801: Allow ACPI SystemIO OpRegion to conflict with PCI BAR
Soheil Hassas Yeganeh (1):
tcp: consider recv buf for the initial window scale
Theodore Ts'o (2):
random: strengthen input validation for RNDADDTOENTCNT
ext4: validate s_reserved_gdt_blocks on mount
Toshi Kani (8):
x86/mm/pat: Add support of non-default PAT MSR setting x86/mm/pat: Add pat_disable() interface x86/mm/pat: Replace cpu_has_pat with boot_cpu_has() x86/mtrr: Fix Xorg crashes in Qemu sessions x86/mtrr: Fix PAT init handling when MTRR is disabled x86/xen, pat: Remove PAT table init code from Xen x86/pat: Document the PAT initialization sequence x86/mm/pat: Fix BUG_ON() in mmap_mem() on QEMU/i386
Vegard Nossum (6):
net/irda: fix NULL pointer dereference on memory allocation failure
block: fix use-after-free in seq file
ext4: check for extents that wrap around
ext4: don't call ext4_should_journal_data() on the journal inode
ext4: short-cut orphan cleanup on error
ext4: fix reference counting bug on block allocation error
Vladimir Davydov (2):
mm: memcontrol: fix swap counter leak on swapout from offline cgroup
mm: memcontrol: fix memcg id ref counter on swap charge move
Wei Fang (2):
fuse: fix wrong assignment of ->flags in fuse_send_init() fs/dcache.c: avoid soft-lockup in dput()
Greg KH
maintainerDocumentation/x86/pat.txt +32 -0
@@ -196,3 +196,35 @@ Another, more verbose way of getting PAT related debug messages is with "debugpat" boot parameter. With this parameter, various debug messages are printed to dmesg log. +PAT Initialization +------------------ + +The following table describes how PAT is initialized under various +configurations. The PAT MSR must be updated by Linux in order to support WC +and WT attributes. Otherwise, the PAT MSR has the value programmed in it +by the firmware. Note, Xen enables WC attribute in the PAT MSR for guests. + + MTRR PAT Call Sequence PAT State PAT MSR + ========================================================= + E E MTRR -> PAT init Enabled OS + E D MTRR -> PAT init Disabled - + D E MTRR -> PAT disable Disabled BIOS + D D MTRR -> PAT disable Disabled - + - np/E PAT -> PAT disable Disabled BIOS + - np/D PAT -> PAT disable Disabled - + E !P/E MTRR -> PAT init Disabled BIOS + D !P/E MTRR -> PAT disable Disabled BIOS + !M !P/E MTRR stub -> PAT disable Disabled BIOS + + Legend + ------------------------------------------------ + E Feature enabled in CPU + D Feature disabled/unsupported in CPU + np "nopat" boot option specified + !P CONFIG_X86_PAT option unset + !M CONFIG_MTRR option unset + Enabled PAT state set to enabled + Disabled PAT state set to disabled + OS PAT initializes PAT MSR with OS setting + BIOS PAT keeps PAT MSR with BIOS setting +
Makefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 4 -SUBLEVEL = 17 +SUBLEVEL = 18 EXTRAVERSION = NAME = Blurry Fish Butt
arch/arm/kernel/sys_oabi-compat.c +7 -1
@@ -279,8 +279,12 @@ asmlinkage long sys_oabi_epoll_wait(int epfd,mm_segment_t fs;long ret, err, i; -if (maxevents <=0 || maxevents > (INT_MAX /sizeof (struct epoll_event ))) +if (maxevents <=0 || + maxevents > (INT_MAX /sizeof (*kbuf)) || + maxevents > (INT_MAX /sizeof (*events)))return -EINVAL ; +if (!access_ok (VERIFY_WRITE , events,sizeof (*events) * maxevents)) +return -EFAULT ; kbuf =kmalloc (sizeof (*kbuf) * maxevents,GFP_KERNEL );if (!kbuf)return -ENOMEM ;
@@ -317,6 +321,8 @@ asmlinkage long sys_oabi_semtimedop(int semid,if (nsops <1 || nsops >SEMOPM )return -EINVAL ; +if (!access_ok (VERIFY_READ , tsops,sizeof (*tsops) * nsops)) +return -EFAULT ; sops =kmalloc (sizeof (*sops) * nsops,GFP_KERNEL );if (!sops)return -ENOMEM ;
arch/mips/kernel/scall64-n32.S +1 -1
@@ -344,7 +344,7 @@ EXPORT(sysn32_call_table) PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key PTR sys_request_key - PTR sys_keyctl /* 6245 */ + PTR compat_sys_keyctl /* 6245 */ PTR sys_set_thread_area PTR sys_inotify_init PTR sys_inotify_add_watch
arch/mips/kernel/scall64-o32.S +1 -1
@@ -500,7 +500,7 @@ EXPORT(sys32_call_table) PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key /* 4280 */ PTR sys_request_key - PTR sys_keyctl + PTR compat_sys_keyctl PTR sys_set_thread_area PTR sys_inotify_init PTR sys_inotify_add_watch /* 4285 */
arch/s390/kernel/ipl.c +0 -7
@@ -2070,13 +2070,6 @@ void s390_reset_system(void (*fn_pre)(void), S390_lowcore.program_new_psw.addr =PSW_ADDR_AMODE | (unsigned long ) s390_base_pgm_handler; -/* -* Clear subchannel ID and number to signal new kernel that no CCW or -* SCSI IPL has been done (for kexec and kdump) -*/ - S390_lowcore.subchannel_id =0 ; - S390_lowcore.subchannel_nr =0 ; -/* Store status at absolute zero */ store_status ();
arch/x86/entry/syscalls/syscall_32.tbl +1 -1
@@ -294,7 +294,7 @@ # 285 sys_setaltroot 286 i386 add_key sys_add_key 287 i386 request_key sys_request_key -288 i386 keyctl sys_keyctl +288 i386 keyctl sys_keyctl compat_sys_keyctl 289 i386 ioprio_set sys_ioprio_set 290 i386 ioprio_get sys_ioprio_get 291 i386 inotify_init sys_inotify_init
arch/x86/include/asm/mtrr.h +5 -1
@@ -24,6 +24,7 @@#define _ASM_X86_MTRR_H#include <uapi/asm/mtrr.h> +#include <asm/pat.h> /*
@@ -83,9 +84,12 @@ static inline int mtrr_trim_uncached_memory(unsigned long end_pfn)static inline void mtrr_centaur_report_mcr (int mcr,u32 lo,u32 hi) { } +static inline void mtrr_bp_init (void ) +{ +pat_disable ("MTRRs disabled, skipping PAT initialization too." ); +}#define mtrr_ap_init () do {} while (0) -#define mtrr_bp_init () do {} while (0)#define set_mtrr_aps_delayed_init () do {} while (0)#define mtrr_aps_init () do {} while (0)#define mtrr_bp_restore () do {} while (0)
arch/x86/include/asm/pat.h +1 -1
@@ -5,8 +5,8 @@#include <asm/pgtable_types.h> bool pat_enabled (void ); +void pat_disable (const char *reason);extern void pat_init (void ); -void pat_init_cache_modes (u64 );extern int reserve_memtype (u64 start,u64 end,enum page_cache_mode req_pcm,enum page_cache_mode *ret_pcm);
arch/x86/kernel/cpu/mtrr/generic.c +14 -10
@@ -444,11 +444,24 @@ static void __init print_mtrr_state(void)pr_debug ("TOM2: %016llx aka %lldM\n" , mtrr_tom2, mtrr_tom2>>20 ); } +/* PAT setup for BP. We need to go through sync steps here */ +void __init mtrr_bp_pat_init (void ) +{ +unsigned long flags; + +local_irq_save (flags); +prepare_set (); + +pat_init (); + +post_set (); +local_irq_restore (flags); +} +/* Grab all of the MTRR state for this CPU into *state */ bool __init get_mtrr_state (void ) {struct mtrr_var_range *vrs; -unsigned long flags;unsigned lo, dummy;unsigned int i;
@@ -481,15 +494,6 @@ bool __init get_mtrr_state(void) mtrr_state_set =1 ; -/* PAT setup for BP. We need to go through sync steps here */ -local_irq_save (flags); -prepare_set (); - -pat_init (); - -post_set (); -local_irq_restore (flags); -return !!(mtrr_state.enabled &MTRR_STATE_MTRR_ENABLED ); }
arch/x86/kernel/cpu/mtrr/main.c +12 -1
@@ -752,6 +752,9 @@ void __init mtrr_bp_init(void)/* BIOS may override */ __mtrr_enabled =get_mtrr_state (); +if (mtrr_enabled ()) +mtrr_bp_pat_init (); +if (mtrr_cleanup (phys_addr)) { changed_by_mtrr_cleanup =1 ; mtrr_if->set_all ();
@@ -759,8 +762,16 @@ void __init mtrr_bp_init(void) } } -if (!mtrr_enabled ()) +if (!mtrr_enabled ()) {pr_info ("MTRR: Disabled\n" ); + +/* +* PAT initialization relies on MTRR's rendezvous handler. +* Skip PAT init until the handler can initialize both +* features independently. +*/ +pat_disable ("MTRRs disabled, skipping PAT initialization too." ); + } }void mtrr_ap_init (void )
arch/x86/kernel/cpu/mtrr/mtrr.h +1 -0
@@ -52,6 +52,7 @@ void set_mtrr_prepare_save(struct set_mtrr_context *ctxt);void fill_mtrr_var_range (unsigned int index,u32 base_lo,u32 base_hi,u32 mask_lo,u32 mask_hi);bool get_mtrr_state (void ); +void mtrr_bp_pat_init (void );extern void set_mtrr_ops (const struct mtrr_ops *ops);
arch/x86/mm/mmap.c +1 -13
@@ -94,18 +94,6 @@ static unsigned long mmap_base(unsigned long rnd) }/* -* Bottom-up (legacy) layout on X86_32 did not support randomization, X86_64 -* does, but not when emulating X86_32 -*/ -static unsigned long mmap_legacy_base (unsigned long rnd) -{ -if (mmap_is_ia32 ()) -return TASK_UNMAPPED_BASE ; -else -return TASK_UNMAPPED_BASE + rnd; -} - -/* * This function, called very early during the creation of a new * process VM image, sets up which VM layout function to use: */
@@ -116,7 +104,7 @@ void arch_pick_mmap_layout(struct mm_struct *mm)if (current->flags &PF_RANDOMIZE ) random_factor =arch_mmap_rnd (); - mm->mmap_legacy_base =mmap_legacy_base (random_factor); + mm->mmap_legacy_base =TASK_UNMAPPED_BASE + random_factor;if (mmap_is_legacy ()) { mm->mmap_base = mm->mmap_legacy_base;
arch/x86/mm/pat.c +67 -42
168 lines not on this page · raw message
arch/x86/xen/enlighten.c +0 -9
@@ -74,7 +74,6 @@#include <asm/mach_traps.h> #include <asm/mwait.h> #include <asm/pci_x86.h> -#include <asm/pat.h> #include <asm/cpu.h> #ifdef CONFIG_ACPI
@@ -1519,7 +1518,6 @@ asmlinkage __visible void __init xen_start_kernel(void) {struct physdev_set_iopl set_iopl;unsigned long initrd_start =0 ; -u64 pat;int rc;if (!xen_start_info)
@@ -1627,13 +1625,6 @@ asmlinkage __visible void __init xen_start_kernel(void) xen_start_info->nr_pages);xen_reserve_special_pages (); -/* -* Modify the cache mode translation tables to match Xen's PAT -* configuration. -*/ -rdmsrl (MSR_IA32_CR_PAT , pat); -pat_init_cache_modes (pat); -/* keep using Xen gdt for now; no urgent need to change it */ #ifdef CONFIG_X86_32
block/genhd.c +1 -0
@@ -831,6 +831,7 @@ static void disk_seqf_stop(struct seq_file *seqf, void *v)if (iter) {class_dev_iter_exit (iter);kfree (iter); + seqf->private =NULL ; } }
crypto/gcm.c +3 -1
@@ -639,7 +639,9 @@ static int crypto_gcm_create_common(struct crypto_template *tmpl, ghash_alg =crypto_find_alg (ghash_name, &crypto_ahash_type,CRYPTO_ALG_TYPE_HASH , -CRYPTO_ALG_TYPE_AHASH_MASK ); +CRYPTO_ALG_TYPE_AHASH_MASK | +crypto_requires_sync (algt->type, + algt->mask));if (IS_ERR (ghash_alg))return PTR_ERR (ghash_alg);
crypto/scatterwalk.c +2 -1
@@ -72,7 +72,8 @@ static void scatterwalk_pagedone(struct scatter_walk *walk, int out,void scatterwalk_done (struct scatter_walk *walk,int out,int more) { -if (!(scatterwalk_pagelen (walk) & (PAGE_SIZE -1 )) || !more) +if (!more || walk->offset >= walk->sg->offset + walk->sg->length || + !(walk->offset & (PAGE_SIZE -1 )))scatterwalk_pagedone (walk, out, more); }EXPORT_SYMBOL_GPL (scatterwalk_done);
drivers/char/random.c +7 -6
@@ -722,15 +722,18 @@ retry: } } -static void credit_entropy_bits_safe (struct entropy_store *r,int nbits) +static int credit_entropy_bits_safe (struct entropy_store *r,int nbits) {const int nbits_max = (int )(~0U >> (ENTROPY_SHIFT +1 )); +if (nbits <0 ) +return -EINVAL ; +/* Cap the value to avoid overflows */ nbits =min (nbits, nbits_max); - nbits =max (nbits, -nbits_max);credit_entropy_bits (r, nbits); +return 0 ; }/*********************************************************************
@@ -1542,8 +1545,7 @@ static long random_ioctl(struct file *f, unsigned int cmd, unsigned long arg)return -EPERM ;if (get_user (ent_count, p))return -EFAULT ; -credit_entropy_bits_safe (&input_pool, ent_count); -return 0 ; +return credit_entropy_bits_safe (&input_pool, ent_count);case RNDADDENTROPY :if (!capable (CAP_SYS_ADMIN ))return -EPERM ;
@@ -1557,8 +1559,7 @@ static long random_ioctl(struct file *f, unsigned int cmd, unsigned long arg) size);if (retval <0 )return retval; -credit_entropy_bits_safe (&input_pool, ent_count); -return 0 ; +return credit_entropy_bits_safe (&input_pool, ent_count);case RNDZAPENTCNT :case RNDCLEARPOOL :/*
drivers/gpu/drm/i915/intel_pm.c +9 -5
@@ -1789,16 +1789,20 @@ static uint32_t ilk_compute_cur_wm(const struct intel_crtc_state *cstate, const struct intel_plane_state *pstate, uint32_t mem_value) { - int bpp = pstate->base.fb ? pstate->base.fb->bits_per_pixel / 8 : 0; +/* +* We treat the cursor plane as always-on for the purposes of watermark +* calculation. Until we have two-stage watermark programming merged, +* this is necessary to avoid flickering. +*/ +int cpp =4 ; +int width = pstate->visible ? pstate->base.crtc_w :64 ; -if (!cstate->base.active || !pstate->visible) +if (!cstate->base.active)return 0 ;return ilk_wm_method2 (ilk_pipe_pixel_rate (cstate), cstate->base.adjusted_mode.crtc_htotal, -drm_rect_width (&pstate->dst), - bpp, - mem_value); + width, cpp, mem_value); }/* Only for WM_LP. */
drivers/hid/hid-sony.c +4 -2
@@ -1418,8 +1418,10 @@ static int sixaxis_set_operational_usb(struct hid_device *hdev) } ret =hid_hw_output_report (hdev, buf,1 ); -if (ret <0 ) -hid_err (hdev,"can't set operational mode: step 3\n" ); +if (ret <0 ) { +hid_info (hdev,"can't set operational mode: step 3, ignoring\n" ); + ret =0 ; + } out:kfree (buf);
drivers/i2c/busses/i2c-i801.c +94 -9
174 lines not on this page · raw message
drivers/net/bonding/bond_netlink.c +5 -1
@@ -446,7 +446,11 @@ static int bond_newlink(struct net *src_net, struct net_device *bond_dev,if (err <0 )return err; -return register_netdevice (bond_dev); + err =register_netdevice (bond_dev); + +netif_carrier_off (bond_dev); + +return err; }static size_t bond_get_size (const struct net_device *bond_dev)
drivers/net/ethernet/broadcom/bgmac.c +1 -1
@@ -219,7 +219,7 @@ err_dma:dma_unmap_single (dma_dev, slot->dma_addr,skb_headlen (skb),DMA_TO_DEVICE ); -while (i >0 ) { +while (i-- >0 ) {int index = (ring->end + i) %BGMAC_TX_RING_SLOTS ;struct bgmac_slot_info *slot = &ring->slots[index];u32 ctl1 =le32_to_cpu (ring->cpu_base[index].ctl1);
drivers/net/ethernet/qlogic/qed/qed_spq.c +3 -4
@@ -794,13 +794,12 @@ int qed_spq_completion(struct qed_hwfn *p_hwfn,* in a bitmap and increasing the chain consumer only * for the first successive completed entries. */ -bitmap_set (p_spq->p_comp_bitmap, pos,SPQ_RING_SIZE ); +__set_bit (pos, p_spq->p_comp_bitmap);while (test_bit (p_spq->comp_bitmap_idx, p_spq->p_comp_bitmap)) { -bitmap_clear (p_spq->p_comp_bitmap, - p_spq->comp_bitmap_idx, -SPQ_RING_SIZE ); +__clear_bit (p_spq->comp_bitmap_idx, + p_spq->p_comp_bitmap); p_spq->comp_bitmap_idx++;qed_chain_return_produced (&p_spq->chain); }
drivers/net/usb/cdc_ncm.c +5 -15
@@ -952,8 +952,6 @@ EXPORT_SYMBOL_GPL(cdc_ncm_select_altsetting);static int cdc_ncm_bind (struct usbnet *dev,struct usb_interface *intf) { -int ret; -/* MBIM backwards compatible function? */ if (cdc_ncm_select_altsetting (intf) !=CDC_NCM_COMM_ALTSETTING_NCM )return -ENODEV ;
@@ -962,16 +960,7 @@ static int cdc_ncm_bind(struct usbnet *dev, struct usb_interface *intf)* Additionally, generic NCM devices are assumed to accept arbitrarily * placed NDP. */ - ret =cdc_ncm_bind_common (dev, intf,CDC_NCM_DATA_ALTSETTING_NCM ,0 ); - -/* -* We should get an event when network connection is "connected" or -* "disconnected". Set network connection in "disconnected" state -* (carrier is OFF) during attach, so the IP network stack does not -* start IPv6 negotiation and more. -*/ -usbnet_link_change (dev,0 ,0 ); -return ret; +return cdc_ncm_bind_common (dev, intf,CDC_NCM_DATA_ALTSETTING_NCM ,0 ); }static void cdc_ncm_align_tail (struct sk_buff *skb,size_t modulus,size_t remainder,size_t max)
@@ -1554,7 +1543,8 @@ static void cdc_ncm_status(struct usbnet *dev, struct urb *urb)static const struct driver_info cdc_ncm_info = { .description ="CDC NCM" , - .flags =FLAG_POINTTOPOINT |FLAG_NO_SETINT |FLAG_MULTI_PACKET , + .flags =FLAG_POINTTOPOINT |FLAG_NO_SETINT |FLAG_MULTI_PACKET + |FLAG_LINK_INTR , .bind = cdc_ncm_bind, .unbind = cdc_ncm_unbind, .manage_power = usbnet_manage_power,
@@ -1567,7 +1557,7 @@ static const struct driver_info cdc_ncm_info = {static const struct driver_info wwan_info = { .description ="Mobile Broadband Network Device" , .flags =FLAG_POINTTOPOINT |FLAG_NO_SETINT |FLAG_MULTI_PACKET - |FLAG_WWAN , + |FLAG_LINK_INTR |FLAG_WWAN , .bind = cdc_ncm_bind, .unbind = cdc_ncm_unbind, .manage_power = usbnet_manage_power,
@@ -1580,7 +1570,7 @@ static const struct driver_info wwan_info = {static const struct driver_info wwan_noarp_info = { .description ="Mobile Broadband Network Device (NO ARP)" , .flags =FLAG_POINTTOPOINT |FLAG_NO_SETINT |FLAG_MULTI_PACKET - |FLAG_WWAN |FLAG_NOARP , + |FLAG_LINK_INTR |FLAG_WWAN |FLAG_NOARP , .bind = cdc_ncm_bind, .unbind = cdc_ncm_unbind, .manage_power = usbnet_manage_power,
drivers/pnp/quirks.c +2 -0
@@ -342,7 +342,9 @@ static void quirk_amd_mmconfig_area(struct pnp_dev *dev)/* Device IDs of parts that have 32KB MCH space */ static const unsigned int mch_quirk_devices[] = {0x0154 ,/* Ivy Bridge */ +0x0a04 ,/* Haswell-ULT */ 0x0c00 ,/* Haswell */ +0x1604 ,/* Broadwell */ };static struct pci_dev *get_intel_host (void )
drivers/scsi/scsi_sysfs.c +4 -3
@@ -1058,11 +1058,12 @@ int scsi_sysfs_add_sdev(struct scsi_device *sdev) } error =scsi_dh_add_device (sdev); -if (error) { +if (error) +/* +* device_handler is optional, so any error can be ignored +*/ sdev_printk (KERN_INFO , sdev,"failed to add device handler: %d\n" , error); -return error; - }device_enable_async_suspend (&sdev->sdev_dev); error =device_add (&sdev->sdev_dev);
drivers/staging/rdma/ipath/ipath_file_ops.c +5 -0
@@ -45,6 +45,8 @@#include <linux/uio.h> #include <asm/pgtable.h> +#include <rdma/ib.h> +#include "ipath_kernel.h" #include "ipath_common.h" #include "ipath_user_sdma.h"
@@ -2243,6 +2245,9 @@ static ssize_t ipath_write(struct file *fp, const char __user *data,ssize_t ret =0 ;void *dest; +if (WARN_ON_ONCE (!ib_safe_file_access (fp))) +return -EACCES ; +if (count <sizeof (cmd.type)) { ret = -EINVAL ; goto bail;
drivers/tty/pty.c +30 -33
109 lines not on this page · raw message
fs/dcache.c +5 -2
@@ -578,7 +578,6 @@ static struct dentry *dentry_kill(struct dentry *dentry) failed:spin_unlock (&dentry->d_lock); -cpu_relax ();return dentry;/* try again with same dentry */ }
@@ -752,6 +751,8 @@ void dput(struct dentry *dentry)return ; repeat: +might_sleep (); +rcu_read_lock ();if (likely (fast_dput (dentry))) {rcu_read_unlock ();
@@ -783,8 +784,10 @@ repeat: kill_it: dentry =dentry_kill (dentry); -if (dentry) +if (dentry) { +cond_resched (); goto repeat; + } }EXPORT_SYMBOL (dput);
fs/devpts/inode.c +24 -25
121 lines not on this page · raw message
fs/ext4/balloc.c +3 -0
@@ -208,6 +208,9 @@ static int ext4_init_block_bitmap(struct super_block *sb,memset (bh->b_data,0 , sb->s_blocksize); bit_max =ext4_num_base_meta_clusters (sb, block_group); +if ((bit_max >>3 ) >= bh->b_size) +return -EFSCORRUPTED ; +for (bit =0 ; bit < bit_max; bit++)ext4_set_bit (bit, bh->b_data);
fs/ext4/extents.c +6 -2
@@ -376,9 +376,13 @@ static int ext4_valid_extent(struct inode *inode, struct ext4_extent *ext)ext4_fsblk_t block =ext4_ext_pblock (ext);int len =ext4_ext_get_actual_len (ext);ext4_lblk_t lblock =le32_to_cpu (ext->ee_block); -ext4_lblk_t last = lblock + len -1 ; -if (len ==0 || lblock > last) +/* +* We allow neither: +* - zero length +* - overflow/wrap-around +*/ +if (lblock + len <= lblock)return 0 ;return ext4_data_block_valid (EXT4_SB (inode->i_sb), block, len); }
fs/ext4/inode.c +29 -6
@@ -205,9 +205,9 @@ void ext4_evict_inode(struct inode *inode)* Note that directories do not have this problem because they * don't use page cache. */ -if (ext4_should_journal_data (inode) && - (S_ISLNK (inode->i_mode) ||S_ISREG (inode->i_mode)) && - inode->i_ino !=EXT4_JOURNAL_INO ) { +if (inode->i_ino !=EXT4_JOURNAL_INO && +ext4_should_journal_data (inode) && + (S_ISLNK (inode->i_mode) ||S_ISREG (inode->i_mode))) {journal_t *journal =EXT4_SB (inode->i_sb)->s_journal;tid_t commit_tid =EXT4_I (inode)->i_datasync_tid;
@@ -2589,13 +2589,36 @@ retry: done = true; } } -ext4_journal_stop (handle); +/* +* Caution: If the handle is synchronous, +* ext4_journal_stop() can wait for transaction commit +* to finish which may depend on writeback of pages to +* complete or on page lock to be released. In that +* case, we have to wait until after after we have +* submitted all the IO, released page locks we hold, +* and dropped io_end reference (for extent conversion +* to be able to complete) before stopping the handle. +*/ +if (!ext4_handle_valid (handle) || handle->h_sync ==0 ) { +ext4_journal_stop (handle); + handle =NULL ; + }/* Submit prepared bio */ ext4_io_submit (&mpd.io_submit);/* Unlock pages we didn't use */ mpage_release_unused_pages (&mpd, give_up_on_write); -/* Drop our io_end reference we got from init */ -ext4_put_io_end (mpd.io_submit.io_end); +/* +* Drop our io_end reference we got from init. We have +* to be careful and use deferred io_end finishing if +* we are still holding the transaction as we can +* release the last reference to io_end which may end +* up doing unwritten extent conversion. +*/ +if (handle) { +ext4_put_io_end_defer (mpd.io_submit.io_end); +ext4_journal_stop (handle); + }else +ext4_put_io_end (mpd.io_submit.io_end);if (ret == -ENOSPC && sbi->s_journal) {/*
fs/ext4/mballoc.c +3 -14
@@ -2932,7 +2932,7 @@ ext4_mb_mark_diskspace_used(struct ext4_allocation_context *ac,ext4_error (sb,"Allocating blocks %llu-%llu which overlap " "fs metadata" , block, block+len);/* File system mounted not to panic on error -* Fix the bitmap and repeat the block allocation +* Fix the bitmap and return EFSCORRUPTED * We leak some of the blocks here. */ ext4_lock_group (sb, ac->ac_b_ex.fe_group);
@@ -2941,7 +2941,7 @@ ext4_mb_mark_diskspace_used(struct ext4_allocation_context *ac,ext4_unlock_group (sb, ac->ac_b_ex.fe_group); err =ext4_handle_dirty_metadata (handle,NULL , bitmap_bh);if (!err) - err = -EAGAIN ; + err = -EFSCORRUPTED ; goto out_err; }
@@ -4506,18 +4506,7 @@ repeat: }if (likely (ac->ac_status ==AC_STATUS_FOUND )) { *errp =ext4_mb_mark_diskspace_used (ac, handle, reserv_clstrs); -if (*errp == -EAGAIN ) { -/* -* drop the reference that we took -* in ext4_mb_use_best_found -*/ -ext4_mb_release_context (ac); - ac->ac_b_ex.fe_group =0 ; - ac->ac_b_ex.fe_start =0 ; - ac->ac_b_ex.fe_len =0 ; - ac->ac_status =AC_STATUS_CONTINUE ; - goto repeat; - }else if (*errp) { +if (*errp) {ext4_discard_allocated_blocks (ac); goto errout; }else {
fs/ext4/super.c +17 -0
@@ -2240,6 +2240,16 @@ static void ext4_orphan_cleanup(struct super_block *sb,while (es->s_last_orphan) {struct inode *inode; +/* +* We may have encountered an error during cleanup; if +* so, skip the rest. +*/ +if (EXT4_SB (sb)->s_mount_state &EXT4_ERROR_FS ) { +jbd_debug (1 ,"Skipping orphan recovery on fs with errors.\n" ); + es->s_last_orphan =0 ; +break ; + } + inode =ext4_orphan_get (sb,le32_to_cpu (es->s_last_orphan));if (IS_ERR (inode)) { es->s_last_orphan =0 ;
@@ -3372,6 +3382,13 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) goto failed_mount; } +if (le16_to_cpu (sbi->s_es->s_reserved_gdt_blocks) > (blocksize /4 )) { +ext4_msg (sb,KERN_ERR , +"Number of reserved GDT blocks insanely large: %d" , +le16_to_cpu (sbi->s_es->s_reserved_gdt_blocks)); + goto failed_mount; + } +if (sbi->s_mount_opt &EXT4_MOUNT_DAX ) {if (blocksize !=PAGE_SIZE ) { ext4_msg(sb, KERN_ERR,
fs/fuse/file.c +24 -0
@@ -417,6 +417,15 @@ static int fuse_flush(struct file *file, fl_owner_t id)fuse_sync_writes (inode);mutex_unlock (&inode->i_mutex); +if (test_bit (AS_ENOSPC , &file->f_mapping->flags) && +test_and_clear_bit (AS_ENOSPC , &file->f_mapping->flags)) + err = -ENOSPC ; +if (test_bit (AS_EIO , &file->f_mapping->flags) && +test_and_clear_bit (AS_EIO , &file->f_mapping->flags)) + err = -EIO ; +if (err) +return err; + req =fuse_get_req_nofail_nopages (fc, file);memset (&inarg,0 ,sizeof (inarg)); inarg.fh = ff->fh;
@@ -462,6 +471,21 @@ int fuse_fsync_common(struct file *file, loff_t start, loff_t end, goto out;fuse_sync_writes (inode); + +/* +* Due to implementation of fuse writeback +* filemap_write_and_wait_range() does not catch errors. +* We have to do this directly after fuse_sync_writes() +*/ +if (test_bit (AS_ENOSPC , &file->f_mapping->flags) && +test_and_clear_bit (AS_ENOSPC , &file->f_mapping->flags)) + err = -ENOSPC ; +if (test_bit (AS_EIO , &file->f_mapping->flags) && +test_and_clear_bit (AS_EIO , &file->f_mapping->flags)) + err = -EIO ; +if (err) + goto out; + err =sync_inode_metadata (inode,1 );if (err) goto out;
fs/fuse/inode.c +1 -1
@@ -926,7 +926,7 @@ static void fuse_send_init(struct fuse_conn *fc, struct fuse_req *req) arg->flags |=FUSE_ASYNC_READ |FUSE_POSIX_LOCKS |FUSE_ATOMIC_O_TRUNC |FUSE_EXPORT_SUPPORT |FUSE_BIG_WRITES |FUSE_DONT_MASK |FUSE_SPLICE_WRITE |FUSE_SPLICE_MOVE |FUSE_SPLICE_READ | -FUSE_FLOCK_LOCKS |FUSE_IOCTL_DIR |FUSE_AUTO_INVAL_DATA | +FUSE_FLOCK_LOCKS |FUSE_HAS_IOCTL_DIR |FUSE_AUTO_INVAL_DATA |FUSE_DO_READDIRPLUS |FUSE_READDIRPLUS_AUTO |FUSE_ASYNC_DIO |FUSE_WRITEBACK_CACHE |FUSE_NO_OPEN_SUPPORT ; req->in.h.opcode =FUSE_INIT ;
include/linux/devpts_fs.h +10 -24
@@ -15,38 +15,24 @@#include <linux/errno.h> +struct pts_fs_info ; +#ifdef CONFIG_UNIX98_PTYS -int devpts_new_index (struct inode *ptmx_inode); -void devpts_kill_index (struct inode *ptmx_inode,int idx); -void devpts_add_ref (struct inode *ptmx_inode); -void devpts_del_ref (struct inode *ptmx_inode); +/* Look up a pts fs info and get a ref to it */ +struct pts_fs_info *devpts_get_ref (struct inode *,struct file *); +void devpts_put_ref (struct pts_fs_info *); + +int devpts_new_index (struct pts_fs_info *); +void devpts_kill_index (struct pts_fs_info *,int ); +/* mknod in devpts */ -struct inode *devpts_pty_new (struct inode *ptmx_inode,dev_t device,int index, -void *priv); +struct inode *devpts_pty_new (struct pts_fs_info *,dev_t ,int ,void *);/* get private structure */ void *devpts_get_priv (struct inode *pts_inode);/* unlink */ void devpts_pty_kill (struct inode *inode); -#else - -/* Dummy stubs in the no-pty case */ -static inline int devpts_new_index (struct inode *ptmx_inode) {return -EINVAL ; } -static inline void devpts_kill_index (struct inode *ptmx_inode,int idx) { } -static inline void devpts_add_ref (struct inode *ptmx_inode) { } -static inline void devpts_del_ref (struct inode *ptmx_inode) { } -static inline struct inode *devpts_pty_new (struct inode *ptmx_inode, -dev_t device,int index,void *priv) -{ -return ERR_PTR (-EINVAL ); -} -static inline void *devpts_get_priv (struct inode *pts_inode) -{ -return NULL ; -} -static inline void devpts_pty_kill (struct inode *inode) { } -#endif
include/linux/memcontrol.h +8 -0
@@ -174,6 +174,11 @@ struct mem_cgroup_thresholds {struct mem_cgroup_threshold_ary *spare; }; +struct mem_cgroup_id { +int id; +atomic_t ref; +}; +/* * The memory controller data structure. The memory controller controls both * page cache and RSS per cgroup. We would eventually like to provide
@@ -183,6 +188,9 @@ struct mem_cgroup_thresholds {struct mem_cgroup {struct cgroup_subsys_state css; +/* Private memcg ID. Used to ID objects that outlive the cgroup */ +struct mem_cgroup_id id; +/* Accounted resources */ struct page_counter memory;struct page_counter memsw;
ipc/msg.c +1 -1
@@ -680,7 +680,7 @@ long do_msgsnd(int msqid, long mtype, void __user *mtext,rcu_read_lock ();ipc_lock_object (&msq->q_perm); -ipc_rcu_putref (msq, ipc_rcu_free); +ipc_rcu_putref (msq, msg_rcu_free);/* raced with RMID? */ if (!ipc_valid_object (&msq->q_perm)) { err = -EIDRM ;
ipc/sem.c +6 -6
@@ -442,7 +442,7 @@ static inline struct sem_array *sem_obtain_object_check(struct ipc_namespace *nsstatic inline void sem_lock_and_putref (struct sem_array *sma) {sem_lock (sma,NULL ,-1 ); -ipc_rcu_putref (sma, ipc_rcu_free); +ipc_rcu_putref (sma, sem_rcu_free); }static inline void sem_rmid (struct ipc_namespace *ns,struct sem_array *s)
@@ -1385,7 +1385,7 @@ static int semctl_main(struct ipc_namespace *ns, int semid, int semnum,rcu_read_unlock (); sem_io =ipc_alloc (sizeof (ushort)*nsems);if (sem_io ==NULL ) { -ipc_rcu_putref (sma, ipc_rcu_free); +ipc_rcu_putref (sma, sem_rcu_free);return -ENOMEM ; }
@@ -1419,20 +1419,20 @@ static int semctl_main(struct ipc_namespace *ns, int semid, int semnum,if (nsems >SEMMSL_FAST ) { sem_io =ipc_alloc (sizeof (ushort)*nsems);if (sem_io ==NULL ) { -ipc_rcu_putref (sma, ipc_rcu_free); +ipc_rcu_putref (sma, sem_rcu_free);return -ENOMEM ; } }if (copy_from_user (sem_io, p, nsems*sizeof (ushort))) { -ipc_rcu_putref (sma, ipc_rcu_free); +ipc_rcu_putref (sma, sem_rcu_free); err = -EFAULT ; goto out_free; }for (i =0 ; i < nsems; i++) {if (sem_io[i] >SEMVMX ) { -ipc_rcu_putref (sma, ipc_rcu_free); +ipc_rcu_putref (sma, sem_rcu_free); err = -ERANGE ; goto out_free; }
@@ -1722,7 +1722,7 @@ static struct sem_undo *find_alloc_undo(struct ipc_namespace *ns, int semid)/* step 2: allocate new undo structure */ new =kzalloc (sizeof (struct sem_undo ) +sizeof (short )*nsems,GFP_KERNEL );if (!new) { -ipc_rcu_putref (sma, ipc_rcu_free); +ipc_rcu_putref (sma, sem_rcu_free);return ERR_PTR (-ENOMEM ); }
mm/memcontrol.c +119 -23
225 lines not on this page · raw message
mm/slab_common.c +2 -2
@@ -521,8 +521,8 @@ void memcg_create_kmem_cache(struct mem_cgroup *memcg, goto out_unlock;cgroup_name (css->cgroup, memcg_name_buf,sizeof (memcg_name_buf)); - cache_name =kasprintf (GFP_KERNEL ,"%s(%d:%s)" , root_cache->name, - css->id, memcg_name_buf); + cache_name =kasprintf (GFP_KERNEL ,"%s(%llu:%s)" , root_cache->name, + css->serial_nr, memcg_name_buf);if (!cache_name) goto out_unlock;
net/ipv4/fib_semantics.c +6 -0
@@ -479,6 +479,9 @@ static int fib_get_nhs(struct fib_info *fi, struct rtnexthop *rtnh,if (!rtnh_ok (rtnh, remaining))return -EINVAL ; +if (rtnh->rtnh_flags & (RTNH_F_DEAD |RTNH_F_LINKDOWN )) +return -EINVAL ; + nexthop_nh->nh_flags = (cfg->fc_flags & ~0xFF ) | rtnh->rtnh_flags; nexthop_nh->nh_oif = rtnh->rtnh_ifindex;
@@ -1003,6 +1006,9 @@ struct fib_info *fib_create_info(struct fib_config *cfg)if (fib_props[cfg->fc_type].scope > cfg->fc_scope) goto err_inval; +if (cfg->fc_flags & (RTNH_F_DEAD |RTNH_F_LINKDOWN )) + goto err_inval; +#ifdef CONFIG_IP_ROUTE_MULTIPATH if (cfg->fc_mp) { nhs =fib_count_nexthops (cfg->fc_mp, cfg->fc_mp_len);
net/ipv4/tcp_input.c +32 -22
87 lines not on this page · raw message
net/ipv4/tcp_output.c +2 -1
@@ -239,7 +239,8 @@ void tcp_select_initial_window(int __space, __u32 mss,/* Set window scaling on max possible window * See RFC1323 for an explanation of the limit to 14 */ - space =max_t (u32, sysctl_tcp_rmem[2 ], sysctl_rmem_max); + space =max_t (u32, space, sysctl_tcp_rmem[2 ]); + space =max_t (u32, space, sysctl_rmem_max); space =min_t (u32, space, *window_clamp);while (space >65535 && (*rcv_wscale) <14 ) { space >>=1 ;
net/irda/af_irda.c +5 -2
@@ -1024,8 +1024,11 @@ static int irda_connect(struct socket *sock, struct sockaddr *uaddr, }/* Check if we have opened a local TSAP */ -if (!self->tsap) -irda_open_tsap (self,LSAP_ANY , addr->sir_name); +if (!self->tsap) { + err =irda_open_tsap (self,LSAP_ANY , addr->sir_name); +if (err) + goto out; + }/* Move to connecting socket, start sending Connect Requests */ sock->state =SS_CONNECTING ;
security/apparmor/apparmorfs.c +1 -0
@@ -331,6 +331,7 @@ static int aa_fs_seq_hash_show(struct seq_file *seq, void *v)seq_printf (seq,"%.2x" , profile->hash[i]);seq_puts (seq,"\n" ); } +aa_put_profile (profile);return 0 ; }