Linux 3.18.49
Greg KH
maintainerI'm announcing the release of the 3.18.49 kernel.
All users of the 3.18 kernel series must upgrade.
The updated 3.18.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.18.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
Oh, and if you are wonding what is going on here, please see the 3.19.49-rc1 release announcement, it should explain it all...
thanks,
greg k-h
------------
Documentation/Makefile | 2 Documentation/mic/Makefile | 1 Documentation/mic/mpssd/.gitignore | 1 Documentation/mic/mpssd/Makefile | 19 Documentation/mic/mpssd/micctrl | 173 - Documentation/mic/mpssd/mpss | 202 -- Documentation/mic/mpssd/mpssd.c | 1728 ------------------ Documentation/mic/mpssd/mpssd.h | 102 - Documentation/mic/mpssd/sysfs.c | 102 - Documentation/networking/netlink_mmap.txt | 339 --- Makefile | 2 arch/arm/include/asm/floppy.h | 2 arch/mips/configs/ip27_defconfig | 1 arch/mips/dec/int-handler.S | 40 arch/mips/sgi-ip22/Platform | 2 arch/powerpc/lib/sstep.c | 20 arch/s390/include/asm/processor.h | 3 arch/s390/kernel/setup.c | 8 arch/s390/kvm/kvm-s390.c | 3 arch/s390/mm/pgtable.c | 19 arch/x86/crypto/ghash-clmulni-intel_glue.c | 26 arch/x86/include/asm/uaccess.h | 10 arch/xtensa/kernel/setup.c | 4 crypto/Makefile | 2 crypto/algif_hash.c | 2 crypto/cryptd.c | 1 crypto/mcryptd.c | 1 drivers/block/drbd/drbd_main.c | 2 drivers/bluetooth/ath3k.c | 2 drivers/bluetooth/btusb.c | 1 drivers/gpu/drm/ast/ast_post.c | 48 drivers/gpu/drm/exynos/exynos_drm_core.c | 2 drivers/gpu/drm/ttm/ttm_bo.c | 4 drivers/hid/hid-ids.h | 1 drivers/hid/usbhid/hid-quirks.c | 1 drivers/infiniband/ulp/ipoib/ipoib_cm.c | 12 drivers/infiniband/ulp/ipoib/ipoib_main.c | 6 drivers/input/serio/gscps2.c | 2 drivers/iommu/dmar.c | 4 drivers/iommu/intel-iommu.c | 13 drivers/md/dm.c | 55 drivers/md/raid10.c | 4 drivers/media/usb/dvb-usb/dib0700_core.c | 5 drivers/mtd/maps/pmcmsp-flash.c | 4 drivers/mtd/ubi/fastmap.c | 7 drivers/net/ethernet/mellanox/mlx4/cq.c | 38 drivers/net/ethernet/mellanox/mlx4/en_rx.c | 13 drivers/net/ethernet/mellanox/mlx4/resource_tracker.c | 5 drivers/net/ethernet/smsc/smc91x.c | 2 drivers/net/ethernet/ti/cpmac.c | 2 drivers/net/vxlan.c | 2 drivers/pwm/core.c | 2 drivers/pwm/sysfs.c | 18 drivers/s390/cio/qdio_thinint.c | 8 drivers/scsi/mvsas/mv_sas.c | 4 drivers/staging/android/ashmem.c | 1 drivers/staging/android/binder.c | 35 drivers/staging/iio/impedance-analyzer/ad5933.c | 17 drivers/staging/nvec/nvec_ps2.c | 6 drivers/tty/n_hdlc.c | 143 - drivers/tty/serial/8250/8250_pci.c | 13 drivers/tty/vt/vt.c | 2 drivers/usb/chipidea/core.c | 1 drivers/usb/chipidea/udc.c | 2 drivers/usb/class/cdc-acm.c | 2 drivers/usb/core/config.c | 10 drivers/usb/core/hcd.c | 7 drivers/usb/core/hub.c | 13 drivers/usb/core/quirks.c | 8 drivers/usb/dwc3/gadget.h | 14 drivers/usb/gadget/function/f_fs.c | 15 drivers/usb/gadget/function/f_uvc.c | 2 drivers/usb/gadget/function/u_ether.c | 8 drivers/usb/gadget/udc/dummy_hcd.c | 2 drivers/usb/host/xhci-plat.c | 2 drivers/usb/misc/idmouse.c | 3 drivers/usb/misc/iowarrior.c | 21 drivers/usb/misc/lvstest.c | 4 drivers/usb/misc/uss720.c | 5 drivers/usb/serial/digi_acceleport.c | 14 drivers/usb/serial/io_ti.c | 8 drivers/usb/serial/omninet.c | 6 drivers/usb/serial/qcserial.c | 2 drivers/usb/serial/safe_serial.c | 5 drivers/usb/wusbcore/wa-hc.c | 3 drivers/video/fbdev/core/fbcmap.c | 26 fs/coredump.c | 3 fs/fat/inode.c | 13 fs/xfs/xfs_aops.c | 13 include/linux/can/core.h | 7 include/linux/ceph/osdmap.h | 2 include/linux/lockd/lockd.h | 3 include/linux/mroute.h | 2 include/linux/mroute6.h | 2 include/linux/pwm.h | 5 include/linux/usb/quirks.h | 6 include/net/cipso_ipv4.h | 4 include/trace/events/syscalls.h | 1 include/uapi/linux/netlink.h | 4 include/uapi/linux/netlink_diag.h | 2 include/uapi/linux/packet_diag.h | 2 kernel/futex.c | 22 kernel/padata.c | 5 lib/vsprintf.c | 2 mm/swapfile.c | 2 net/can/af_can.c | 12 net/can/af_can.h | 3 net/can/bcm.c | 4 net/can/gw.c | 2 net/can/raw.c | 4 net/ceph/osdmap.c | 1 net/core/dev.c | 100 - net/core/pktgen.c | 17 net/core/skbuff.c | 30 net/dccp/ccids/ccid2.c | 1 net/dccp/input.c | 3 net/dccp/ipv4.c | 3 net/dccp/ipv6.c | 8 net/dccp/minisocks.c | 1 net/ipv4/cipso_ipv4.c | 4 net/ipv4/ip_sockglue.c | 9 net/ipv4/ipmr.c | 3 net/ipv4/ping.c | 2 net/ipv4/route.c | 4 net/ipv4/sysctl_net_ipv4.c | 4 net/ipv4/tcp.c | 6 net/ipv4/tcp_input.c | 3 net/ipv4/tcp_ipv4.c | 10 net/ipv4/tcp_output.c | 21 net/ipv4/tcp_timer.c | 6 net/ipv6/addrconf.c | 2 net/ipv6/ip6_gre.c | 42 net/ipv6/ip6_tunnel.c | 34 net/ipv6/ip6_vti.c | 4 net/ipv6/ip6mr.c | 5 net/ipv6/route.c | 4 net/ipv6/sit.c | 1 net/ipv6/tcp_ipv6.c | 32 net/l2tp/l2tp_core.h | 1 net/l2tp/l2tp_ip.c | 29 net/l2tp/l2tp_ip6.c | 2 net/llc/llc_conn.c | 3 net/llc/llc_sap.c | 3 net/mac80211/pm.c | 1 net/netlink/Kconfig | 9 net/netlink/af_netlink.c | 741 ------- net/netlink/af_netlink.h | 15 net/netlink/diag.c | 39 net/packet/af_packet.c | 22 net/sctp/sm_statefuns.c | 12 net/sctp/socket.c | 8 net/socket.c | 4 net/unix/af_unix.c | 66 net/xfrm/xfrm_policy.c | 10 net/xfrm/xfrm_user.c | 9 samples/mic/mpssd/.gitignore | 1 samples/mic/mpssd/Makefile | 27 samples/mic/mpssd/micctrl | 173 + samples/mic/mpssd/mpss | 202 ++ samples/mic/mpssd/mpssd.c | 1728 ++++++++++++++++++ samples/mic/mpssd/mpssd.h | 102 + samples/mic/mpssd/sysfs.c | 102 + security/selinux/hooks.c | 2 sound/soc/codecs/cs4270.c | 8 sound/usb/quirks-table.h | 17 tools/testing/ktest/ktest.pl | 2 166 files changed, 3337 insertions(+), 3968 deletions(-)
Alan Stern (1):
USB: fix linked-list corruption in rh_call_control()
Alexander Popov (1):
tty: n_hdlc: get rid of racy n_hdlc.tbuf
Alexander Potapenko (1):
net: don't call strlen() on the user buffer in packet_bind_spkt()
Andrew Collins (1):
net: Add netdev all_adj_list refcnt propagation to fix panic
Andrey Konovalov (2):
dccp: fix freeing skb too early for IPV6_RECVPKTINFO net/packet: fix overflow in check for priv area size
Andrey Ryabinin (1):
coredump: fix unfreezable coredumping task
Andy Whitcroft (2):
xfrm_user: validate XFRM_MSG_NEWAE incoming ESN size harder
xfrm_user: validate XFRM_MSG_NEWAE XFRMA_REPLAY_ESN_VAL replay_window
Anoob Soman (1):
packet: call fanout_release, while UNREGISTERING a netdev
Arnaldo Carvalho de Melo (1):
dccp: Unlock sock before calling sk_free()
Arnd Bergmann (10):
ARM: 8584/1: floppy: avoid gcc-6 warning
drm/exynos: fix error handling in exynos_drm_subdrv_open
smc91x: avoid self-comparison warning
staging: iio: ad5933: avoid uninitialized variable in error case
libceph: use BUG() instead of BUG_ON(1)
crypto: improve gcc optimization flags for serpent and wp512
mtd: pmcmsp: use kstrndup instead of kmalloc+strncpy
cpmac: remove hopeless #warning
MIPS: ip27: Disable qlge driver in defconfig
MIPS: ip22: Fix ip28 build for modern gcc
Arve Hjønnevåg (2):
ANDROID: binder: Add strong ref checks
ANDROID: binder: Clear binder and cookie when setting handle in flat binder struct
Ashok Raj (1):
iommu/vt-d: Fix IOMMU lookup for SR-IOV Virtual Functions
Benjamin Poirier (1):
mlx4: Invoke softirqs after napi_reschedule
Bjørn Mork (1):
USB: serial: qcserial: add Dell DW5811e
Boris Brezillon (1):
UBI: fastmap: scrub PEB when bitflips are detected in a free PEB EC header
Dan Carpenter (1):
ipv6: pointer math error in ip6_tnl_parse_tlv_enc_lim()
David Forster (1):
vti6: return GRE_KEY for vti6
David Hsu (1):
pwm: Unexport children before chip removal
Dmitry Tunin (1):
Bluetooth: Add another AR3012 04ca:3018 device
Dmitry V. Levin (1):
uapi: fix linux/packet_diag.h userspace compilation error
Douglas Caetano dos Santos (1):
tcp: fix wrong checksum calculation on MTU probing
Eric Dumazet (20):
can: Fix kernel panic at security_sock_rcv_skb
ipv6: fix ip6_tnl_parse_tlv_enc_lim()
tcp: fix 0 divide in __tcp_select_window()
net: use a work queue to defer net_disable_timestamp() work
ipv4: keep skb->dst around in presence of IP options
netlabel: out of bound access in cipso_v4_validate()
l2tp: do not use udp_ioctl()
ip6_gre: fix ip6gre_err() invalid reads
ipv6: tcp: restore IP6CB for pktoptions skbs
ipv6: tcp: add a missing tcp_v6_restore_cb()
tcp: avoid infinite loop in tcp_splice_read()
tcp: fix overflow in __tcp_retransmit_skb()
tcp: fix a compile error in DBGUNDO()
net: pktgen: remove rcu locking in pktgen_change_name()
ipv4: disable BH in set_ping_group_range()
netlink: do not enter direct reclaim from netlink_dump() net/llc: avoid BUG_ON() in skb_orphan()
tcp: fix various issues for sockets morphing to listen state
net: fix socket refcounting in skb_complete_wifi_ack()
net: fix socket refcounting in skb_complete_tx_timestamp()
Eugenia Emantayev (1):
net/mlx4_en: Fix bad WQE issue
Felipe Balbi (3):
usb: gadget: u_ether: remove interrupt throttling
usb: dwc3: gadget: make Set Endpoint Configuration macros safe
usb: gadget: function: f_fs: pass companion descriptor along
Feras Daoud (1):
IB/ipoib: Fix deadlock between rmmod and set_mode
Florian Westphal (2):
xfrm: policy: init locks early
netlink: remove mmapped netlink support
Geert Uytterhoeven (1):
Input: gscps2 - fix MODULE_DEVICE_TABLE invocation
Greg Kroah-Hartman (1):
Linux 3.18.49
Guenter Roeck (3):
usb: host: xhci-plat: Fix timeout on removal of hot pluggable xhci controllers
usb: hub: Wait for connection to be reestablished after port reset
usb: hub: Fix crash after failure to read BOS descriptor
Hannes Frederic Sowa (1):
dccp: fix memory leak during tear-down of unsuccessful connection request
Heiko Carstens (2):
s390: make setup_randomness work
s390: use correct input data address for setup_randomness
Ian Abbott (1):
serial: 8250_pci: Add MKS Tenta SCOM-0800 and SCOM-0801 cards
Ilya Dryomov (1):
libceph: don't set weight to IN when OSD is destroyed
Jack Morgenstein (2):
net/mlx4_core: Fix racy CQ (Completion Queue) free
net/mlx4_core: Fix when to save some qp context flags for dynamic VST to VGT transitions
Jann Horn (1):
swapfile: fix memory corruption via malformed swapfile
Janosch Frank (2):
KVM: s390: Disable dirty log retrieval for UCONTROL guests
KVM: s390: Fix guest migration for huge guests resulting in panic
Jason A. Donenfeld (1):
padata: avoid race in reordering
Jiri Slaby (4):
tty: vt, fix bogus division in csi_J
net: sctp, forbid negative length
TTY: n_hdlc, fix lockdep false positive
crypto: algif_hash - avoid zero-sized array
Johan Hovold (13):
USB: cdc-acm: fix TIOCMIWAIT
USB: serial: digi_acceleport: fix OOB data sanity check
USB: serial: digi_acceleport: fix OOB-event processing
USB: serial: safe_serial: fix information leak in completion handler
USB: serial: omninet: fix reference leaks at open
USB: iowarrior: fix NULL-deref at probe
USB: iowarrior: fix NULL-deref in write
USB: serial: io_ti: fix NULL-deref in interrupt callback
USB: serial: io_ti: fix information leak in completion handler
USB: uss720: fix NULL-deref at probe
USB: lvtest: fix NULL-deref at probe
USB: idmouse: fix NULL-deref at probe
USB: wusbcore: fix NULL-deref at probe
Jon Maxwell (1):
dccp/tcp: fix routing redirect race
Julian Anastasov (1):
ipv4: mask tos for input route
Julian Wiedmann (1):
s390/qdio: clear DSCI prior to scanning multiple input queues
Kees Cook (1):
fbdev: color map copying bounds checking
Lance Richardson (1):
ip6_gre: fix flowi6_proto value in ip6gre_xmit_other()
Linus Torvalds (2):
Revert "af_unix: Fix splice-bind deadlock"
Fix potential infoleak in older kernels
Luis de Bethencourt (1):
mvsas: fix misleading indentation
Marcel Hasler (1):
ALSA: usb-audio: Add quirk for Syntek STK1160
Marcelo Ricardo Leitner (2):
sctp: avoid BUG_ON on sctp_wait_for_sndbuf
sctp: validate chunk len before actually using it
Martin Schwidefsky (1):
s390: TASK_SIZE for kernel threads
Matt Chen (1):
mac80211: flush delayed work when entering suspend
Matthias Schiffer (1):
vxlan: correctly validate VXLAN ID against VXLAN_N_VID
Max Filippov (1):
xtensa: move parse_tag_fdt out of #ifdef CONFIG_BLK_DEV_INITRD
Maxime Jayat (1):
net: socket: fix recvmmsg not returning error from sock_error
Michel Dänzer (1):
drm/ttm: Make sure BOs being swapped out are cacheable
Mikulas Patocka (1):
dm: flush queued bios when process blocks to avoid deadlock
Nicolas Dichtel (1):
ipv6: correctly add local routes when lo goes up
Nikolay Aleksandrov (1):
ipmr, ip6mr: fix scheduling while atomic and a deadlock with ipmr_get_route
OGAWA Hirofumi (1):
fat: fix using uninitialized fields of fat_inode/fsinfo_inode
Oliver Neukum (1):
HID: usbhid: add ATEN CS962 to list of quirky devices
Paul Fertser (2):
drivers: staging: nvec: remove bogus reset command for PS/2 interface Revert "staging: nvec: ps2: change serio type to passthrough"
Paul Hüber (1):
l2tp: avoid use-after-free caused by l2tp_ip_backlog_recv
Peter Chen (2):
usb: chipidea: move the lock initialization to core file
usb: gadget: dummy_hcd: clear usb_gadget region before registration
Peter Zijlstra (2):
futex: Fix potential use-after-free in FUTEX_REQUEUE_PI
futex: Add missing error handling to FUTEX_REQUEUE_PI
Ralf Baechle (1):
MIPS: DEC: Avoid la pseudo-instruction in delay slots
Rasmus Villemoes (1):
lib/vsprintf.c: improve sanity check in vsnprintf()
Ravi Bangoria (1):
powerpc: Emulation support for load/store instructions on LE
Richard Weinberger (1):
drbd: Fix kernel_sendmsg() usage - potential NULL deref
Rik van Riel (1):
tracing: Add #undef to fix compile error
Roger Quadros (1):
usb: gadget: f_uvc: Fix SuperSpeed companion descriptor's wBytesPerInterval
Samuel Thibault (1):
usb-core: Add LINEAR_FRAME_INTR_BINTERVAL USB quirk
Sean Young (1):
dib0700: fix nec repeat handling
Shuah Khan (1):
samples: move mic/mpssd example code from Documentation
Shuxiao Zhang (1):
staging: android: ashmem: lseek failed due to no FMODE_LSEEK.
Stephen Smalley (1):
selinux: fix off-by-one in setprocattr
Steven Rostedt (VMware) (1):
ktest: Fix child exit code processing
Tomasz Majchrzak (1):
raid10: increment write counter after bio is split
Trond Myklebust (1):
nlm: Ensure callback code also checks that the files match
WANG Cong (2):
sit: fix a double free on error path
ping: fix a null pointer dereference
Wang, Rui Y (3):
crypto: cryptd - Assign statesize properly
crypto: mcryptd - Fix load failure
crypto: ghash-clmulni - Fix load failure
Willem de Bruijn (1):
packet: on direct_xmit, limit tso and csum to supported devices
Y.C. Chen (3):
drm/ast: Fix test for VGA enabled
drm/ast: Call open_key before enable_mmio in POST code drm/ast: Fix AST2400 POST failure without BMC FW or VBIOS
Zhaohongjiang (1):
cancel the setfilesize transation when io error happen
murray foster (1):
ASoC: cs4270: fix DAPM stream name mismatch
Greg KH
maintainerDocumentation/Makefile +1 -1
@@ -1,4 +1,4 @@ subdir-y := accounting auxdisplay blackfin connector \ - filesystems filesystems ia64 laptops mic misc-devices \ + filesystems filesystems ia64 laptops misc-devices \ networking pcmcia prctl ptp spi timers vDSO video4linux \ watchdog
Documentation/mic/Makefile deleted +0 -1
@@ -1 +0,0 @@ -subdir-y := mpssd
Documentation/mic/mpssd/.gitignore deleted +0 -1
@@ -1 +0,0 @@ -mpssd
Documentation/mic/mpssd/Makefile deleted +0 -19
@@ -1,19 +0,0 @@ -# List of programs to build -hostprogs-y := mpssd - -mpssd-objs := mpssd.o sysfs.o - -# Tell kbuild to always build the programs -always := $(hostprogs-y) - -HOSTCFLAGS += -I$(objtree)/usr/include -I$(srctree)/tools/include - -ifdef DEBUG -HOSTCFLAGS += -DDEBUG=$(DEBUG) -endif - -HOSTLOADLIBES_mpssd := -lpthread - -install: - install mpssd /usr/sbin/mpssd - install micctrl /usr/sbin/micctrl
Documentation/mic/mpssd/micctrl deleted +0 -173
173 lines not on this page · raw message
Documentation/mic/mpssd/mpss deleted +0 -202
202 lines not on this page · raw message
Documentation/mic/mpssd/mpssd.c deleted +0 -1728
1,728 lines not on this page · raw message
Documentation/mic/mpssd/mpssd.h deleted +0 -102
102 lines not on this page · raw message
Documentation/mic/mpssd/sysfs.c deleted +0 -102
102 lines not on this page · raw message
Documentation/networking/netlink_mmap.txt deleted +0 -339
339 lines not on this page · raw message
Makefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 18 -SUBLEVEL = 48 +SUBLEVEL = 49 EXTRAVERSION = NAME = Diseased Newt
arch/arm/include/asm/floppy.h +1 -1
@@ -17,7 +17,7 @@#define fd_outb (val,port) \ do { \ - if ((port) == FD_DOR) \ + if ((port) == (u32)FD_DOR) \ fd_setdor((val)); \ else \ outb((val),(port)); \
arch/mips/configs/ip27_defconfig +0 -1
@@ -206,7 +206,6 @@ CONFIG_MLX4_EN=m # CONFIG_MLX4_DEBUG is not set CONFIG_TEHUTI=m CONFIG_BNX2X=m -CONFIG_QLGE=m CONFIG_SFC=m CONFIG_BE2NET=m CONFIG_LIBERTAS_THINFIRM=m
arch/mips/dec/int-handler.S +38 -2
@@ -146,7 +146,25 @@ /* * Find irq with highest priority */ - PTR_LA t1,cpu_mask_nr_tbl + # open coded PTR_LA t1, cpu_mask_nr_tbl +#if (_MIPS_SZPTR == 32) + # open coded la t1, cpu_mask_nr_tbl + lui t1, %hi(cpu_mask_nr_tbl) + addiu t1, %lo(cpu_mask_nr_tbl) + +#endif +#if (_MIPS_SZPTR == 64) + # open coded dla t1, cpu_mask_nr_tbl + .set push + .set noat + lui t1, %highest(cpu_mask_nr_tbl) + lui AT, %hi(cpu_mask_nr_tbl) + daddiu t1, t1, %higher(cpu_mask_nr_tbl) + daddiu AT, AT, %lo(cpu_mask_nr_tbl) + dsll t1, 32 + daddu t1, t1, AT + .set pop +#endif 1: lw t2,(t1) nop and t2,t0
@@ -195,7 +213,25 @@ /* * Find irq with highest priority */ - PTR_LA t1,asic_mask_nr_tbl + # open coded PTR_LA t1,asic_mask_nr_tbl +#if (_MIPS_SZPTR == 32) + # open coded la t1, asic_mask_nr_tbl + lui t1, %hi(asic_mask_nr_tbl) + addiu t1, %lo(asic_mask_nr_tbl) + +#endif +#if (_MIPS_SZPTR == 64) + # open coded dla t1, asic_mask_nr_tbl + .set push + .set noat + lui t1, %highest(asic_mask_nr_tbl) + lui AT, %hi(asic_mask_nr_tbl) + daddiu t1, t1, %higher(asic_mask_nr_tbl) + daddiu AT, AT, %lo(asic_mask_nr_tbl) + dsll t1, 32 + daddu t1, t1, AT + .set pop +#endif 2: lw t2,(t1) nop and t2,t0
arch/mips/sgi-ip22/Platform +1 -1
@@ -25,7 +25,7 @@ endif # Simplified: what IP22 does at 128MB+ in ksegN, IP28 does at 512MB+ in xkphys # ifdef CONFIG_SGI_IP28 - ifeq ($(call cc-option-yn,-mr10k-cache-barrier=store), n) + ifeq ($(call cc-option-yn,-march=r10000 -mr10k-cache-barrier=store), n) $(error gcc doesn't support needed option -mr10k-cache-barrier=store) endif endif
arch/powerpc/lib/sstep.c +0 -20
@@ -1806,8 +1806,6 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr) goto instr_done;case LARX : -if (regs->msr &MSR_LE ) -return 0 ;if (op.ea & (size -1 ))break ;/* can't handle misaligned */ err = -EFAULT ;
@@ -1829,8 +1827,6 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr) goto ldst_done;case STCX : -if (regs->msr &MSR_LE ) -return 0 ;if (op.ea & (size -1 ))break ;/* can't handle misaligned */ err = -EFAULT ;
@@ -1854,8 +1850,6 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr) goto ldst_done;case LOAD : -if (regs->msr &MSR_LE ) -return 0 ; err =read_mem (®s->gpr[op.reg], op.ea, size, regs);if (!err) {if (op.type &SIGNEXT )
@@ -1866,8 +1860,6 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr) goto ldst_done;case LOAD_FP : -if (regs->msr &MSR_LE ) -return 0 ;if (size ==4 ) err =do_fp_load (op.reg, do_lfs, op.ea, size, regs);else
@@ -1876,15 +1868,11 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr)#ifdef CONFIG_ALTIVEC case LOAD_VMX : -if (regs->msr &MSR_LE ) -return 0 ; err =do_vec_load (op.reg, do_lvx, op.ea & ~0xfUL , regs); goto ldst_done;#endif #ifdef CONFIG_VSX case LOAD_VSX : -if (regs->msr &MSR_LE ) -return 0 ; err =do_vsx_load (op.reg, do_lxvd2x, op.ea, regs); goto ldst_done;#endif
@@ -1907,8 +1895,6 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr) goto instr_done;case STORE : -if (regs->msr &MSR_LE ) -return 0 ; if ((op.type & UPDATE) && size == sizeof(long) && op.reg == 1 && op.update_reg == 1 && !(regs->msr & MSR_PR) &&
@@ -1920,8 +1906,6 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr) goto ldst_done;case STORE_FP : -if (regs->msr &MSR_LE ) -return 0 ;if (size ==4 ) err =do_fp_store (op.reg, do_stfs, op.ea, size, regs);else
@@ -1930,15 +1914,11 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr)#ifdef CONFIG_ALTIVEC case STORE_VMX : -if (regs->msr &MSR_LE ) -return 0 ; err =do_vec_store (op.reg, do_stvx, op.ea & ~0xfUL , regs); goto ldst_done;#endif #ifdef CONFIG_VSX case STORE_VSX : -if (regs->msr &MSR_LE ) -return 0 ; err =do_vsx_store (op.reg, do_stxvd2x, op.ea, regs); goto ldst_done;#endif
arch/s390/include/asm/processor.h +2 -1
@@ -74,7 +74,8 @@ extern void execve_tail(void);#else /* CONFIG_64BIT */ -#define TASK_SIZE_OF (tsk) ((tsk)->mm->context.asce_limit) +#define TASK_SIZE_OF (tsk) ((tsk)->mm ? \ + (tsk)->mm->context.asce_limit : TASK_MAX_SIZE)#define TASK_UNMAPPED_BASE (test_thread_flag(TIF_31BIT) ? \ (1UL << 30) : (1UL << 41))#define TASK_SIZE TASK_SIZE_OF(current)
arch/s390/kernel/setup.c +4 -4
@@ -822,10 +822,10 @@ static void __init setup_randomness(void) {struct sysinfo_3_2_2 *vmms; - vmms = (struct sysinfo_3_2_2 *)alloc_page (GFP_KERNEL ); -if (vmms &&stsi (vmms,3 ,2 ,2 ) ==0 && vmms->count) -add_device_randomness (&vmms, vmms->count); -free_page ((unsigned long ) vmms); + vmms = (struct sysinfo_3_2_2 *)memblock_alloc (PAGE_SIZE ,PAGE_SIZE ); +if (stsi (vmms,3 ,2 ,2 ) ==0 && vmms->count) +add_device_randomness (&vmms->vm,sizeof (vmms->vm[0 ]) * vmms->count); +memblock_free ((unsigned long ) vmms,PAGE_SIZE ); }/*
arch/s390/kvm/kvm-s390.c +3 -0
@@ -207,6 +207,9 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm,struct kvm_memory_slot *memslot;int is_dirty =0 ; +if (kvm_is_ucontrol (kvm)) +return -EINVAL ; +mutex_lock (&kvm->slots_lock); r = -EINVAL ;
arch/s390/mm/pgtable.c +18 -1
@@ -1358,11 +1358,28 @@ EXPORT_SYMBOL_GPL(s390_enable_skey);*/ bool gmap_test_and_clear_dirty (unsigned long address,struct gmap *gmap) { +pgd_t *pgd; +pud_t *pud; +pmd_t *pmd;pte_t *pte;spinlock_t *ptl;bool dirty = false; - pte =get_locked_pte (gmap->mm, address, &ptl); + pgd =pgd_offset (gmap->mm, address); + pud =pud_alloc (gmap->mm, pgd, address); +if (!pud) +return false; + pmd =pmd_alloc (gmap->mm, pud, address); +if (!pmd) +return false; +/* We can't run guests backed by huge pages, but userspace can +* still set them up and then try to migrate them without any +* migration support. +*/ +if (pmd_large (*pmd)) +return true; + + pte =pte_alloc_map_lock (gmap->mm, pmd, address, &ptl);if (unlikely (!pte))return false;
arch/x86/crypto/ghash-clmulni-intel_glue.c +26 -0
@@ -218,6 +218,29 @@ static int ghash_async_final(struct ahash_request *req) } } +static int ghash_async_import (struct ahash_request *req,const void *in) +{ +struct ahash_request *cryptd_req =ahash_request_ctx (req); +struct shash_desc *desc =cryptd_shash_desc (cryptd_req); +struct ghash_desc_ctx *dctx =shash_desc_ctx (desc); + +ghash_async_init (req); +memcpy (dctx, in,sizeof (*dctx)); +return 0 ; + +} + +static int ghash_async_export (struct ahash_request *req,void *out) +{ +struct ahash_request *cryptd_req =ahash_request_ctx (req); +struct shash_desc *desc =cryptd_shash_desc (cryptd_req); +struct ghash_desc_ctx *dctx =shash_desc_ctx (desc); + +memcpy (out, dctx,sizeof (*dctx)); +return 0 ; + +} +static int ghash_async_digest (struct ahash_request *req) {struct crypto_ahash *tfm =crypto_ahash_reqtfm (req);
@@ -285,8 +308,11 @@ static struct ahash_alg ghash_async_alg = { .final = ghash_async_final, .setkey = ghash_async_setkey, .digest = ghash_async_digest, + .export = ghash_async_export, + .import = ghash_async_import, .halg = { .digestsize = GHASH_DIGEST_SIZE, + .statesize = sizeof(struct ghash_desc_ctx), .base = { .cra_name = "ghash", .cra_driver_name = "ghash-clmulni",
arch/x86/include/asm/uaccess.h +5 -5
@@ -329,7 +329,7 @@ do { \#define __get_user_asm_u64 (x, ptr, retval, errret) \ __get_user_asm(x, ptr, retval, "q", "", "=r", errret)#define __get_user_asm_ex_u64 (x, ptr) \ - __get_user_asm_ex(x, ptr, "q", "", "=r") + __get_user_asm_ex(x, ptr, "q", "", "=&r")#endif #define __get_user_size (x, ptr, size, retval, errret) \
@@ -372,13 +372,13 @@ do { \__chk_user_ptr (ptr); \switch (size) { \case 1 : \ -__get_user_asm_ex (x, ptr,"b" ,"b" ,"=q" ); \ +__get_user_asm_ex (x, ptr,"b" ,"b" ,"=&q" ); \break ; \case 2 : \ -__get_user_asm_ex (x, ptr,"w" ,"w" ,"=r" ); \ +__get_user_asm_ex (x, ptr,"w" ,"w" ,"=&r" ); \break ; \case 4 : \ -__get_user_asm_ex (x, ptr,"l" ,"k" ,"=r" ); \ +__get_user_asm_ex (x, ptr,"l" ,"k" ,"=&r" ); \break ; \case 8 : \__get_user_asm_ex_u64 (x, ptr); \
@@ -396,7 +396,7 @@ do { \ " jmp 2b\n" \ ".previous\n" \ _ASM_EXTABLE_EX(1b, 3b) \ - : ltype(x) : "m" (__m(addr))) + : ltype(x) : "m" (__m(addr)), "0" (0))#define __put_user_nocheck (x, ptr, size) \ ({ \
arch/xtensa/kernel/setup.c +2 -2
@@ -133,6 +133,8 @@ static int __init parse_tag_initrd(const bp_tag_t* tag)__tagtable (BP_TAG_INITRD , parse_tag_initrd); +#endif /* CONFIG_BLK_DEV_INITRD */ +#ifdef CONFIG_OF static int __init parse_tag_fdt (const bp_tag_t *tag)
@@ -145,8 +147,6 @@ __tagtable(BP_TAG_FDT, parse_tag_fdt);#endif /* CONFIG_OF */ -#endif /* CONFIG_BLK_DEV_INITRD */ -static int __init parse_tag_cmdline (const bp_tag_t * tag) {strlcpy (command_line, (char *)(tag->data),COMMAND_LINE_SIZE );
crypto/Makefile +2 -0
@@ -47,6 +47,7 @@ obj-$(CONFIG_CRYPTO_SHA1) += sha1_generic.o obj-$(CONFIG_CRYPTO_SHA256) += sha256_generic.o obj-$(CONFIG_CRYPTO_SHA512) += sha512_generic.o obj-$(CONFIG_CRYPTO_WP512) += wp512.o +CFLAGS_wp512.o := $(call cc-option,-fno-schedule-insns) # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79149 obj-$(CONFIG_CRYPTO_TGR192) += tgr192.o obj-$(CONFIG_CRYPTO_GF128MUL) += gf128mul.o obj-$(CONFIG_CRYPTO_ECB) += ecb.o
@@ -68,6 +69,7 @@ obj-$(CONFIG_CRYPTO_BLOWFISH_COMMON) += blowfish_common.o obj-$(CONFIG_CRYPTO_TWOFISH) += twofish_generic.o obj-$(CONFIG_CRYPTO_TWOFISH_COMMON) += twofish_common.o obj-$(CONFIG_CRYPTO_SERPENT) += serpent_generic.o +CFLAGS_serpent_generic.o := $(call cc-option,-fsched-pressure) # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79149 obj-$(CONFIG_CRYPTO_AES) += aes_generic.o obj-$(CONFIG_CRYPTO_CAMELLIA) += camellia_generic.o obj-$(CONFIG_CRYPTO_CAST_COMMON) += cast_common.o
crypto/algif_hash.c +1 -1
@@ -195,7 +195,7 @@ static int hash_accept(struct socket *sock, struct socket *newsock, int flags)struct alg_sock *ask =alg_sk (sk);struct hash_ctx *ctx = ask->private;struct ahash_request *req = &ctx->req; -char state[crypto_ahash_statesize (crypto_ahash_reqtfm (req))]; +char state[crypto_ahash_statesize (crypto_ahash_reqtfm (req)) ? :1 ];
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/ast/ast_post.c +38 -10
48 lines not on this page · raw message
drivers/gpu/drm/exynos/exynos_drm_core.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/infiniband/ulp/ipoib/ipoib_cm.c +7 -5
Lines of this file are not shown. View the raw message.
drivers/infiniband/ulp/ipoib/ipoib_main.c +2 -4
Lines of this file are not shown. View the raw message.
drivers/md/dm.c +55 -0
55 lines not on this page · raw message
drivers/media/usb/dvb-usb/dib0700_core.c +3 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/mellanox/mlx4/cq.c +20 -18
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/mellanox/mlx4/en_rx.c +11 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/mellanox/mlx4/resource_tracker.c +3 -2
Lines of this file are not shown. View the raw message.
drivers/staging/iio/impedance-analyzer/ad5933.c +10 -7
Lines of this file are not shown. View the raw message.
drivers/tty/n_hdlc.c +69 -74
143 lines not on this page · raw message
net/core/dev.c +51 -49
100 lines not on this page · raw message
net/ipv6/ip6_gre.c +22 -20
42 lines not on this page · raw message
net/netlink/af_netlink.c +13 -728
741 lines not on this page · raw message
net/unix/af_unix.c +26 -40
66 lines not on this page · raw message
samples/mic/mpssd/micctrl new file +173 -0
173 lines not on this page · raw message
samples/mic/mpssd/mpss new file +202 -0
202 lines not on this page · raw message
samples/mic/mpssd/mpssd.c new file +1728 -0
1,728 lines not on this page · raw message
samples/mic/mpssd/mpssd.h new file +102 -0
102 lines not on this page · raw message
samples/mic/mpssd/sysfs.c new file +102 -0
102 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.