Daniel Borkmann
6bb0fef489
netlink, mmap: fix edge-case leakages in nf queue zero-copy ...
When netlink mmap on receive side is the consumer of nf queue data,
it can happen that in some edge cases, we write skb shared info into
the user space mmap buffer:
Assume a possible rx ring frame size of only 4096, and the network skb,
which is being zero-copied into the netlink skb, contains page frags
with an overall skb->len larger than the linear part of the netlink
skb.
skb_zerocopy(), which is generic and thus not aware of the fact that
shared info cannot be accessed for such skbs then tries to write and
fill frags, thus leaking kernel data/pointers and in some corner cases
possibly writing out of bounds of the mmap area (when filling the
last slot in the ring buffer this way).
I.e. the ring buffer slot is then of status NL_MMAP_STATUS_VALID, has
an advertised length larger than 4096, where the linear part is visible
at the slot beginning, and the leaked sizeof(struct skb_shared_info)
has been written to the beginning of the next slot (also corrupting
the struct nl_mmap_hdr slot header incl. status etc), since skb->end
points to skb->data + ring->frame_size - NL_MMAP_HDRLEN.
The fix adds and lets __netlink_alloc_skb() take the actual needed
linear room for the network skb + meta data into account. It's completely
irrelevant for non-mmaped netlink sockets, but in case mmap sockets
are used, it can be decided whether the available skb_tailroom() is
really large enough for the buffer, or whether it needs to internally
fallback to a normal alloc_skb().
>From nf queue side, the information whether the destination port is
an mmap RX ring is not really available without extra port-to-socket
lookup, thus it can only be determined in lower layers i.e. when
__netlink_alloc_skb() is called that checks internally for this. I
chose to add the extra ldiff parameter as mmap will then still work:
We have data_len and hlen in nfqnl_build_packet_message(), data_len
is the full length (capped at queue->copy_range) for skb_zerocopy()
and hlen some possible part of data_len that needs to be copied; the
rem_len variable indicates the needed remaining linear mmap space.
The only other workaround in nf queue internally would be after
allocation time by f.e. cap'ing the data_len to the skb_tailroom()
iff we deal with an mmap skb, but that would 1) expose the fact that
we use a mmap skb to upper layers, and 2) trim the skb where we
otherwise could just have moved the full skb into the normal receive
queue.
After the patch, in my test case the ring slot doesn't fit and therefore
shows NL_MMAP_STATUS_COPY, where a full skb carries all the data and
thus needs to be picked up via recv().
Fixes: 3ab1f683bf
2015-09-09 21:43:22 -07:00
uart: pl011: Add support to ZTE ZX296702 uart
2015-08-04 22:07:26 -07:00
bcma: switch GPIO portions to use GPIOLIB_IRQCHIP
2015-08-18 09:08:47 +03:00
can: replace timestamp as unique skb attribute
2015-07-12 21:13:22 +02:00
libceph: enable ceph in a non-default network namespace
2015-07-09 20:30:34 +03:00
ARM: SoC driver updates for v4.3
2015-09-01 13:00:04 -07:00
crush: sync up with userspace
2015-06-25 11:49:31 +03:00
dmaengine: pxa: add pxa dmaengine driver
2015-05-26 09:18:29 +05:30
extcon: Use the unique id for external connector instead of string
2015-05-22 18:58:44 +09:00
fsl /bestcomm
gpio: Remove double "base" in comment
2015-07-16 00:12:24 +02:00
Documentation: Add "@" in front of private structure members.
2015-02-27 14:56:57 -07:00
mfd: twl4030-power: Fix pmic for boards that need AC charger disabled
2015-06-22 12:25:04 +01:00
iio: Add inverse unit conversion macros
2015-08-08 12:50:40 +01:00
Input: improve parsing OF parameters for touchscreens
2015-06-25 14:45:46 -07:00
irqchip/gic: Ensure gic_cpu_if_up/down() programs correct GIC instance
2015-08-04 14:14:06 +02:00
ARM: SoC platform updates for v4.3
2015-09-01 12:18:40 -07:00
net/mlx4_en: Add support for hardware accelerated 802.1ad vlan
2015-07-27 15:00:37 -07:00
net/mlx5e: Support ethtool get/set_pauseparam
2015-08-17 15:51:36 -07:00
mmc: mediatek: Add Mediatek MMC driver
2015-06-18 09:20:48 +02:00
mtd: nand: Fix NAND_USE_BOUNCE_BUFFER flag conflict
2015-07-07 13:03:25 -07:00
netfilter: nf_conntrack: make nf_ct_zone_dflt built-in
2015-09-02 16:32:56 -07:00
netfilter: Pass nf_hook_state through arpt_do_table().
2015-04-04 13:26:52 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2015-06-23 14:08:54 -07:00
netfilter: Pass nf_hook_state through ipt_do_table().
2015-04-04 12:47:04 -04:00
netfilter: Pass nf_hook_state through ip6t_do_table().
2015-04-04 12:52:06 -04:00
phy: for 4.2 merge window
2015-06-03 14:13:41 +09:00
pinctrl: use "const struct ..." rather than "struct ... const"
2015-06-01 15:48:12 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2015-09-03 08:08:17 -07:00
power: max17042_battery: add HEALTH and TEMP_* properties support
2015-05-23 22:43:28 +02:00
md/raid6 algorithms: delta syndrome functions
2015-04-22 08:00:41 +10:00
Merge remote-tracking branches 'regulator/topic/qcom-smd', 'regulator/topic/qcom-spmi', 'regulator/topic/rk808', 'regulator/topic/stub' and 'regulator/topic/tol' into regulator-next
2015-08-30 14:40:11 +01:00
ARM: BCM63xx: Add Broadcom BCM63xx PMB controller helpers
2015-05-20 15:05:39 -07:00
ARM: prima2: move to use REGMAP APIs for rtciobrg
2015-06-10 15:10:26 +08:00
timer: Reduce timer migration overhead if disabled
2015-06-19 15:18:28 +02:00
ARM: SoC driver updates for v4.3
2015-09-01 13:00:04 -07:00
spi: expose spi_master and spi_device statistics via sysfs
2015-07-07 13:33:23 +01:00
MIPS: BCM47xx: Extract info about et2 interface
2015-06-21 21:52:24 +02:00
NFS client updates for Linux 4.2
2015-07-02 11:32:23 -07:00
usb: add bus type for USB ULPI
2015-05-13 12:04:55 -05:00
Revert "usb: interface authorization: Introduces the default interface authorization"
2015-08-18 09:58:45 -07:00
uwb: Remove umc bus legacy suspend/resume support
2015-03-18 17:27:03 +01:00
include/linux: remove empty conditionals
2015-04-15 16:35:22 -07:00
Merge branches 'acpi-pci', 'acpi-soc', 'acpi-ec' and 'acpi-osl'
2015-09-01 03:41:19 +02:00
irqchip: Add GICv2 specific ACPI boot support
2015-03-26 15:13:07 +00:00
fs: move struct kiocb to fs.h
2015-03-25 20:28:11 -04:00
alarmtimer: Get rid of unused return value
2015-04-22 17:06:52 +02:00
arm-cci: Split the code for PMU vs driver support
2015-03-27 13:44:43 +00:00
md/raid5: activate raid6 rmw feature
2015-04-22 08:00:42 +10:00
Revert "libata: Implement NCQ autosense"
2015-08-03 12:01:54 -04:00
tty/serial: at91: add support to FIFOs
2015-07-23 18:00:42 -07:00
Merge branch 'getname2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2015-02-17 15:27:47 -08:00
average: remove out-of-line implementation
2015-08-20 14:10:23 -07:00
writeback: don't embed root bdi_writeback_congested in bdi_writeback
2015-07-02 08:46:00 -06:00
writeback: don't embed root bdi_writeback_congested in bdi_writeback
2015-07-02 08:46:00 -06:00
backlight: Change the return type of backlight_update_status() to int
2015-06-23 15:47:35 +01:00
gpio: gpio-generic: add flag to read out output value from reg_set
2015-05-11 11:49:02 +02:00
MIPS: BCM47xx: Move NVRAM driver to the drivers/firmware/
2015-06-21 21:55:33 +02:00
watchdog: bcm47xx_wdt.c: add restart handler support
2015-02-17 21:33:27 +01:00
block: Replace SG_GAPS with new queue limits mask
2015-08-19 14:26:02 -07:00
linux/bitmap: Force inlining of bitmap weight functions
2015-08-05 09:38:08 +02:00
linux/bitmap: Force inlining of bitmap weight functions
2015-08-05 09:38:08 +02:00
blk-cgroup: Drop unlikely before IS_ERR(_OR_NULL)
2015-08-13 10:45:09 -06:00
blk-mq: Shared tag enhancements
2015-06-01 14:35:56 -06:00
block: shrink struct bio down to 2 cache lines again
2015-07-29 08:55:25 -06:00
block: Replace SG_GAPS with new queue limits mask
2015-08-19 14:26:02 -07:00
mm: only define hashdist variable when needed
2015-06-24 17:49:41 -07:00
sched/preempt: Merge preempt_mask.h into preempt.h
2015-05-19 08:39:11 +02:00
bpf: Implement function bpf_perf_event_read() that get the selected hardware PMU conuter
2015-08-09 22:50:06 -07:00
net: phy: broadcom: define Broadcom pseudo-PHY address in brcmphy.h
2015-06-10 23:33:58 -07:00
bufferhead: Add _gfp version for sb_getblk()
2015-07-02 01:32:44 -04:00
drivers/base: cacheinfo: fix annoying typo when DT nodes are absent
2015-05-24 12:31:33 -07:00
kernel: conditionally support non-root users, groups and capabilities
2015-04-15 16:35:22 -07:00
Merge branch 'for-4.3-unified-base' into for-4.3
2015-08-25 14:19:29 -04:00
Merge branch 'for-4.3-unified-base' into for-4.3
2015-08-25 14:19:29 -04:00
cgroup: implement the PIDs subsystem
2015-07-14 17:29:23 -04:00
cleancache: remove limit on the number of cleancache enabled filesystems
2015-04-14 16:49:03 -07:00
clk: Constify clk_hw argument to provider APIs
2015-08-24 16:49:11 -07:00
clkdev: get rid of redundant clk_add_alias() prototype in linux/clk.h
2015-05-06 11:58:51 +01:00
include, lib: add __printf attributes to several function prototypes
2015-07-17 16:39:53 -07:00
clockevents: Remove clockevents_notify() prototype
2015-07-20 11:37:46 +02:00
Merge branch 'linus' into timers/core
2015-05-19 16:12:32 +02:00
mm: cma: constify and use correct signness in mm/cma.c
2015-04-14 16:49:04 -07:00
mm: allow compaction of unevictable pages
2015-04-15 16:35:17 -07:00
include, lib: add __printf attributes to several function prototypes
2015-07-17 16:39:53 -07:00
compiler-gcc: integrate the various compiler-gcc[345].h files
2015-06-25 17:00:38 -07:00
compiler-intel: fix wrong compiler barrier() macro
2015-06-25 17:00:38 -07:00
Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/nvdimm
2015-07-11 20:44:31 -07:00
include, lib: add __printf attributes to several function prototypes
2015-07-17 16:39:53 -07:00
printk: implement support for extended console drivers
2015-06-25 17:00:38 -07:00
vt: add cursor blink interval escape sequence
2015-05-10 19:15:52 +02:00
context_tracking: Add ct_state() and CT_WARN_ON()
2015-07-07 10:59:04 +02:00
context_tracking: Add ct_state() and CT_WARN_ON()
2015-07-07 10:59:04 +02:00
coresight: Fix implicit inclusion of linux/sched.h
2015-08-05 13:30:16 -07:00
efi: Handle memory error structures produced based on old versions of standard
2015-07-15 13:30:38 +01:00
include, lib: add __printf attributes to several function prototypes
2015-07-17 16:39:53 -07:00
thermal: cpu_cooling: implement the power cooling device API
2015-05-04 21:27:52 -07:00
cpufeature: correctly annotate the module init function
2015-07-22 09:58:02 +02:00
Merge branch 'pm-opp'
2015-09-01 15:52:41 +02:00
cpuidle/coupled: Remove cpuidle_device::safe_state_index
2015-08-28 15:14:54 +02:00
cpumask_set_cpu_local_first => cpumask_local_spread, lament
2015-05-28 11:05:20 +09:30
lib: crc-itu-t.[ch] fix 0x0x prefix in integer constants
2015-05-26 15:26:43 +02:00
lib: introduce crc_t10dif_update()
2015-05-30 22:42:24 -07:00
kernel: conditionally support non-root users, groups and capabilities
2015-04-15 16:35:22 -07:00
crypto: aead - Remove CRYPTO_ALG_AEAD_NEW flag
2015-08-17 16:53:53 +08:00
lib/halfmd4.c: simplify includes
2015-02-12 18:54:15 -08:00
include, lib: add __printf attributes to several function prototypes
2015-07-17 16:39:53 -07:00
ipv4: dccp: handle ICMP messages on DCCP_NEW_SYN_RECV request sockets
2015-03-23 16:52:26 -04:00
debugfs: switch to simple_follow_link()
2015-05-10 22:18:24 -04:00
PM / devfreq: event: Add const keyword for devfreq_event_ops structure
2015-03-30 17:09:41 +09:00
block: kill merge_bvec_fn() completely
2015-08-13 12:31:57 -06:00
Power management and ACPI material for v4.3-rc1
2015-09-01 19:45:46 -07:00
dma-buf: add ref counting for module as exporter
2015-05-13 14:35:57 +05:30
include/dma-mapping: Clarify output of dma_map_sg
2015-03-09 13:05:47 +01:00
Merge branch 'topic/xdmac' into for-linus
2015-06-25 09:21:49 +05:30
remove <asm/scatterlist.h>
2015-05-05 13:35:39 -06:00
iommu: dmar: Provide helper to copy shared irte fields
2015-06-12 11:33:52 +02:00
firmware: dmi: struct dmi_header should be packed
2015-06-25 09:06:57 +02:00
The libnvdimm sub-system introduces, in addition to the libnvdimm-core,
2015-06-29 10:34:42 -07:00
cfq-iosched: fix the setting of IOPS mode on SSDs
2015-06-10 08:01:20 -06:00
mm: fold arch_randomize_brk into ARCH_HAS_ELF_RANDOMIZE
2015-04-14 16:49:05 -07:00
net: fix endian check warning in etherdevice.h
2015-08-17 12:14:53 -07:00
extcon: Remove optional print_state() function pointer of struct extcon_dev
2015-08-10 11:48:55 +09:00
f2fs crypto: declare some definitions for f2fs encryption feature
2015-05-28 15:41:45 -07:00
fs: Add support FALLOC_FL_INSERT_RANGE for fallocate
2015-03-25 15:07:05 +11:00
rcu: Rename rcu_lockdep_assert() to RCU_LOCKDEP_WARN()
2015-07-22 15:27:32 -07:00
bpf: also show process name/pid in bpf_jit_dump
2015-07-30 11:13:21 -07:00
[media] fixp-arith: replace sin/cos table by a better precision one
2015-03-02 14:50:06 -03:00
frontswap: allow multiple backends
2015-06-24 17:49:45 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2015-09-01 16:13:25 -07:00
fs_pin: Allow for the possibility that m_list or s_list go unused.
2015-04-09 11:39:55 -05:00
FS-Cache: Retain the netfs context in the retrieval op earlier
2015-04-02 14:28:53 +01:00
drivers: usb: fsl: Workaround for USB erratum-A005275
2015-08-14 16:50:36 -07:00
fsnotify: remove obsolete documentation
2015-06-24 17:49:38 -07:00
ftrace: Fix breakage of set_ftrace_pid
2015-07-24 13:58:14 -04:00
device property: Introduce firmware node type for platform data
2015-04-03 23:23:51 +02:00
genalloc: rename of_get_named_gen_pool() to of_gen_pool_get()
2015-06-30 19:45:01 -07:00
block: partition: convert percpu ref
2015-07-17 08:41:53 -06:00
mm: meminit: finish initialisation of struct pages before basic setup
2015-06-30 19:44:56 -07:00
staging: goldfish: Fix pointer cast for 32 bits
2015-05-31 11:40:14 +09:00
gpio: remove gpiod_sysfs_set_active_low
2015-05-12 10:46:53 +02:00
sched/preempt: Merge preempt_mask.h into preempt.h
2015-05-19 08:39:11 +02:00
First set of IIO fixes for the 4.2 cycle.
2015-07-13 14:18:07 -07:00
HID: hid-sensor-hub: Add support for application collection
2015-02-23 15:11:52 +01:00
HID: Export hid_field_extract()
2015-06-01 14:33:35 +02:00
sched/preempt, mm/kmap: Explicitly disable/enable preemption in kmap_atomic_*
2015-05-19 08:39:14 +02:00
gpu: host1x: Export host1x_syncpt_read()
2015-04-02 18:46:20 +02:00
timer: Minimize nohz off overhead
2015-06-19 15:18:28 +02:00
x86/htirq: Use hierarchical irqdomain to manage Hypertransport interrupts
2015-04-24 15:36:50 +02:00
mm: numa: do not trap faults on the huge zero page
2015-02-12 18:54:08 -08:00
mm: hugetlb: allow hugepages_supported to be architecture specific
2015-07-17 16:39:52 -07:00
hwrng: add devm_* interfaces
2015-03-16 21:45:54 +11:00
hwspinlock/core: add device tree support
2015-05-02 09:54:30 +03:00
Drivers: hv: vmbus: Further improve CPU affiliation logic
2015-08-05 11:44:28 -07:00
Power management and ACPI updates for v4.1-rc1
2015-04-14 20:21:54 -07:00
block: move PM request support to IDE
2015-05-05 13:40:42 -06:00
mac80211: fix BIT position for TDLS WIDE extended cap
2015-08-14 17:49:53 +02:00
ieee802154: Fix EUI-64 station address validation.
2015-05-31 13:40:53 +02:00
bridge: Extend Proxy ARP design to allow optional rules for Wi-Fi
2015-03-05 14:52:23 -05:00
net/core: Add reading VF statistics through the PF netdevice
2015-06-15 17:23:03 -07:00
macvtap: Increase limit of macvtap queues
2015-06-23 06:14:04 -07:00
net: Pass kern from net_proto_family.create to sk_alloc
2015-05-11 10:50:17 -04:00
vlan: Add GRO support for non hardware accelerated vlan
2015-06-01 16:50:52 -07:00
IGMP: Inhibit reports for local multicast groups
2015-08-28 13:28:47 -07:00
sock_diag: specify info_size per inet protocol
2015-06-15 19:49:22 -07:00
net: ipv4 sysctl option to ignore routes when nexthop link is down
2015-06-24 02:15:54 -07:00
module: relocate module_init from init.h to module.h
2015-07-05 23:59:14 -04:00
sched/cputime: Guarantee stime + utime == rtime
2015-08-03 12:21:21 +02:00
IOMMU Updates for Linux v4.2
2015-06-23 18:27:19 -07:00
hrtimer: Remove hrtimer_start() return value
2015-04-22 17:06:52 +02:00
sched/preempt, mm/kmap: Explicitly disable/enable preemption in kmap_atomic_*
2015-05-19 08:39:14 +02:00
x86/mm: Decouple <linux/vmalloc.h> from <asm/io.h>
2015-06-03 12:02:00 +02:00
Break up monolithic iommu table/lock into finer graularity pools and lock
2015-04-18 12:32:59 -07:00
include, lib: add __printf attributes to several function prototypes
2015-07-17 16:39:53 -07:00
kernel/resource.c: remove deprecated __check_region() and friends
2015-04-15 16:35:22 -07:00
net: ipv6 sysctl option to ignore routes when nexthop link is down
2015-08-13 21:27:19 -07:00
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-09-01 14:33:35 -07:00
irq_work: Fix build failure when CONFIG_IRQ_WORK is not defined
2015-03-23 10:55:21 +01:00
irqchip: Move IRQCHIP_DECLARE macro to include/linux/irqchip.h
2015-07-02 22:34:38 +02:00
genirq: Provide irq_desc_has_action
2015-08-06 00:14:59 +02:00
genirq: Add DOMAIN_BUS_NEXUS irqdomain property
2015-07-30 00:14:38 +02:00
irqflags: Fix (at least latent) code generation issue
2015-02-19 01:08:42 +01:00
genirq: Remove irq_node()
2015-06-25 12:06:45 +02:00
jbd2: fix ocfs2 corrupt when updating journal superblock fails
2015-06-15 14:36:01 -04:00
jhash: Update jhash_[321]words functions to use correct initval
2015-04-03 12:52:29 -04:00
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-09-01 14:04:50 -07:00
jump_label: Allow jump labels to be used in assembly
2015-04-09 09:40:24 +02:00
memory: jz4780-nemc: driver for the NEMC on JZ4780 SoCs
2015-03-26 23:51:36 +01:00
x86/kasan, mm: Introduce generic kasan_populate_zero_shadow()
2015-08-22 14:54:55 +02:00
Merge branch 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux into v4l_for_linus
2015-04-21 09:44:55 -03:00
kdb: Avoid printing KERN_ levels to consoles
2015-02-19 12:39:02 -06:00
include, lib: add __printf attributes to several function prototypes
2015-07-17 16:39:53 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2015-07-03 15:20:57 -07:00
kexec: define kexec_in_progress in !CONFIG_KEXEC case
2015-08-04 22:25:28 -07:00
klist: implement klist_prev()
2015-07-28 08:50:42 +01:00
mm: kmemleak_alloc_percpu() should follow the gfp from per_alloc()
2015-06-24 17:49:46 -07:00
include, lib: add __printf attributes to several function prototypes
2015-07-17 16:39:53 -07:00
perf/x86/hw_breakpoints: Disallow kernel breakpoints unless kprobe-safe
2015-08-04 10:16:54 +02:00
mm: consolidate all page-flags helpers in <linux/page-flags.h>
2015-04-15 16:35:17 -07:00
sched: Fix a race between __kthread_bind() and sched_setaffinity()
2015-08-12 12:06:09 +02:00
ktime: Fix ktime_divns to do signed division
2015-05-13 10:19:35 +02:00
KVM: document memory barriers for kvm->vcpus/kvm->online_vcpus
2015-07-30 16:02:54 +02:00
KVM: add memslots argument to kvm_arch_memslots_updated
2015-05-26 12:40:17 +02:00
block: fix blk_stack_limits() regression due to lcm() change
2015-03-31 09:45:50 -06:00
leds: flash: Fix the size of sysfs_groups array
2015-03-30 11:55:48 -07:00
leds: unify the location of led-trigger API
2015-05-04 11:05:55 -07:00
sched/stop_machine: Fix deadlock between multiple stop_two_cpus()
2015-06-19 10:03:12 +02:00
lguest: suppress interrupts for single insn, not range.
2015-03-24 11:52:08 +10:30
libata: add ATA_HORKAGE_MAX_SEC_1024 to revert back to previous max_sectors limit
2015-07-15 11:47:24 -04:00
libfdt: add fdt type definitions
2015-04-29 17:17:17 -05:00
libnvdimm: Add sysfs numa_node to NVDIMM devices
2015-06-26 11:23:38 -04:00
memcg: reparent list_lrus and free kmemcg_id on css offline
2015-02-12 18:54:10 -08:00
livepatch: introduce patch/func-walking helpers
2015-05-19 23:58:43 +02:00
Merge branch 'sched-hrtimers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-06-24 15:09:40 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2015-06-27 13:26:03 -07:00
mailbox: Add ability for clients to request channels by name
2015-06-11 22:19:45 +05:30
mailbox: Make mbox_chan_ops const
2015-05-12 09:18:16 +05:30
bus: mvebu-mbus: add mv_mbus_dram_info_nooverlap()
2015-05-28 12:21:08 +02:00
mdio-gpio: Propagate mii_bus.phy_ignore_ta_mask
2015-05-14 22:35:13 -04:00
mei: bus: add and call callback on notify event
2015-08-03 17:30:00 -07:00
memblock: introduce a for_each_reserved_mem_region iterator
2015-06-30 19:44:55 -07:00
Merge branch 'for-4.2/writeback' of git://git.kernel.dk/linux-block
2015-06-25 16:00:17 -07:00
mm, hotplug: fix concurrent memory hot-add deadlock
2015-04-14 16:49:00 -07:00
mm, mempool: disallow mempools based on slab caches with constructors
2015-04-15 16:35:18 -07:00
add microchip LAN88xx phy driver
2015-09-09 17:19:14 -07:00
mm: numa: remove migrate_ratelimited
2015-04-14 16:49:05 -07:00
char: make misc_deregister a void function
2015-08-05 10:35:49 -07:00
mm: new arch_remap() hook
2015-06-24 17:49:41 -07:00
mm: make page pfmemalloc check more robust
2015-08-21 14:30:10 -07:00
mm: make page pfmemalloc check more robust
2015-08-21 14:30:10 -07:00
include, lib: add __printf attributes to several function prototypes
2015-07-17 16:39:53 -07:00
mm: clarify that the function operates on hugepage pte
2015-06-24 17:49:44 -07:00
mm: meminit: initialise a subset of struct pages if CONFIG_DEFERRED_STRUCT_PAGE_INIT is set
2015-06-30 19:44:56 -07:00
mod_devicetable: add space before */
2015-08-07 15:03:42 +02:00
module: relocate module_init from init.h to module.h
2015-07-05 23:59:14 -04:00
kasan, module: move MODULE_ALIGN macro into <linux/moduleloader.h>
2015-03-12 18:46:08 -07:00
Minor merge needed, due to function move.
2015-07-01 10:49:25 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2015-04-18 11:20:31 -04:00
MPILIB: add mpi_read_buf() and mpi_get_size() helpers
2015-06-16 14:35:06 +08:00
mpls: ip tunnel support
2015-07-21 10:39:05 -07:00
PCI/MSI: Drop domain field from msi_controller
2015-07-30 00:14:39 +02:00
mutex: remove unused field "name" in debug mode
2015-02-14 11:32:59 -08:00
turn user_{path_at,path,lpath,path_dir}() into static inlines
2015-05-15 01:10:45 -04:00
libnvdimm: infrastructure for btt devices
2015-06-25 04:20:04 -04:00
net_dbg_ratelimited: turn into no-op when !DEBUG
2015-08-06 23:51:30 -07:00
switchdev: remove NETIF_F_HW_SWITCH_OFFLOAD feature flag
2015-05-12 18:43:55 -04:00
net: kill long time unused bonding private flags
2015-08-27 16:28:35 -07:00
netfilter: nf_conntrack: make nf_ct_zone_dflt built-in
2015-09-02 16:32:56 -07:00
netfilter: bridge: reduce nf_bridge_info to 32 bytes again
2015-07-30 13:37:42 +02:00
netfilter: don't pull include/linux/netfilter.h from netns headers
2015-06-18 21:14:31 +02:00
netfilter: add netfilter ingress hook after handle_ing() under unique static key
2015-05-14 01:10:05 -04:00
netfilter: Define v6ops in !CONFIG_NETFILTER case.
2015-08-27 16:35:51 -07:00
netlink, mmap: fix edge-case leakages in nf queue zero-copy
2015-09-09 21:43:22 -07:00
NFSv.2/pnfs Add a LAYOUTSTATS rpc function
2015-06-24 10:17:37 -04:00
NFS: nfs_mark_for_revalidate should always set NFS_INO_REVAL_PAGECACHE
2015-07-22 17:15:54 -04:00
NFS: Remove the "NFS_CAP_CHANGE_ATTR" capability
2015-07-22 17:15:54 -04:00
NFS: Remove unused nfs_rw_ops->rw_release() function
2015-06-10 18:32:40 -04:00
NFSv.2/pnfs Add a LAYOUTSTATS rpc function
2015-06-24 10:17:37 -04:00
nilfs2: fix sanity check of btree level in nilfs_btree_root_broken()
2015-05-05 17:10:11 -07:00
watchdog: add watchdog_cpumask sysctl to assist nohz
2015-06-24 17:49:40 -07:00
bitmap, cpumask, nodemask: remove dedicated formatting functions
2015-02-13 21:21:39 -08:00
NTB: Add NTB hardware abstraction layer
2015-07-04 14:04:44 -04:00
NTB: Split ntb_hw_intel and ntb_transport drivers
2015-07-04 14:05:49 -04:00
NVMe: Add nvme subsystem reset IOCTL
2015-08-18 11:56:13 -06:00
nvmem: Add nvmem_device based consumer apis.
2015-08-05 13:43:44 -07:00
nvmem: Add a simple NVMEM framework for nvmem providers
2015-08-05 13:43:12 -07:00
device property: check fwnode type in to_of_node()
2015-08-26 01:46:39 +02:00
of: constify drv arg of of_driver_match_device stub
2015-07-27 08:23:27 -05:00
dmaengine: of_dma: Support for DMA routers
2015-05-09 17:11:25 +05:30
Devicetree changes for v4.2
2015-07-01 19:40:18 -07:00
of: fix a build error to of_graph_get_endpoint_by_regs function
2015-06-24 11:18:48 +10:00
of: iommu: Add ptr to OF node arg to of_iommu_configure()
2015-03-03 14:42:55 -06:00
of/platform: Assign MSI domain to platform device
2015-07-30 00:14:37 +02:00
of: mdio: export of_mdio_parse_addr
2015-03-11 17:56:28 -04:00
net: core: add of_find_net_device_by_node()
2015-03-09 23:50:20 -04:00
of/pci: Add of_pci_dma_configure() to update DMA configuration
2015-03-03 14:42:57 -06:00
of/platform: add function to populate default bus
2015-08-25 11:29:55 -05:00
ARM OMAP2+ GPMC: calculate GPMCFCLKDIVIDER based on WAITMONITORINGTIME
2015-03-06 12:39:48 +02:00
mm: oom_kill: simplify OOM killer locking
2015-06-24 17:49:43 -07:00
locking/rwsem: Reduce spinlock contention in wakeup after up_read()/up_write()
2015-05-08 12:27:59 +02:00
mm: check __PG_HWPOISON separately from PAGE_FLAGS_CHECK_AT_*
2015-08-07 04:39:42 +03:00
mm/page_owner: set correct gfp_mask on page_owner
2015-07-17 16:39:54 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2015-07-04 19:36:06 -07:00
parport: add device-model to parport subsystem
2015-06-01 07:08:18 +09:00
Update Viresh Kumar's email address
2015-07-17 16:39:53 -07:00
PCI/ACPI: Optimize device state transition delays
2015-04-08 16:25:25 -05:00
PCI: Don't clear ASPM bits when the FADT declares it's unsupported
2015-04-09 14:20:11 -05:00
PCI: Move ATS declarations to linux/pci.h so they're all together
2015-08-13 15:59:58 -05:00
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-09-01 14:33:35 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2015-06-24 16:49:49 -07:00
percpu: update incorrect comment for this_cpu_*() operations
2015-07-14 17:43:56 -04:00
percpu_counter: batch size aware __percpu_counter_compare()
2015-05-29 07:39:34 +10:00
perf: add the necessary core perf APIs when accessing events counters in eBPF programs
2015-08-09 22:50:05 -07:00
Remove rest of exec domains.
2015-04-12 21:03:31 +02:00
net: phy: Allow PHY devices to identify themselves as Ethernet switches, etc.
2015-08-31 14:48:01 -07:00
phy: fixed_phy: Add gpio to determine link up/down.
2015-08-31 14:48:02 -07:00
platform_device: better support builtin boilerplate avoidance
2015-06-16 14:12:37 -04:00
PM / sleep: add pm-trace support for suspending phase
2015-03-18 15:54:27 +01:00
Merge branch 'pm-wakeirq'
2015-06-19 01:18:14 +02:00
PM / clock_ops: Provide default runtime ops to users
2015-05-12 23:55:37 +02:00
PM / Domains: Remove unusable governor dummies
2015-08-29 01:54:43 +02:00
PM / OPP: add dev_pm_opp_is_turbo() helper
2015-08-07 03:17:06 +02:00
PM / QoS: Make it possible to expose device latency tolerance to userspace
2015-07-28 08:50:41 +01:00
PM / sleep: Allow devices without runtime PM to do direct-complete
2015-07-21 23:14:22 +02:00
PM / wakeirq: Fix typo in prototype for dev_pm_set_dedicated_wake_irq
2015-05-30 02:17:15 +02:00
PM / Wakeirq: Add automated device wake IRQ handling
2015-05-20 01:56:31 +02:00
The libnvdimm sub-system introduces, in addition to the libnvdimm-core,
2015-06-29 10:34:42 -07:00
PNP: Add helper macro for pnp_register_driver boilerplate
2015-03-18 22:39:16 +01:00
power: Add devm_power_supply_get_by_phandle() helper function
2015-06-10 16:15:54 +02:00
sched/preempt: Fix cond_resched_lock() and cond_resched_softirq()
2015-08-03 12:21:24 +02:00
include, lib: add __printf attributes to several function prototypes
2015-07-17 16:39:53 -07:00
Add a matching set of device_ functions for determining mac/phy
2015-08-13 16:58:29 -07:00
proportions: Spelling s/consitent/consistent/
2015-08-07 14:37:04 +02:00
pstore: Add pstore type id for PPC64 opal nvram partition
2015-03-23 14:06:10 +11:00
ptp: remove 32 bit get/set methods.
2015-03-31 12:01:19 -04:00
pwm: Add pwmchip_add_with_polarity() API
2015-06-12 11:36:30 +02:00
spi: pxa2xx: Add support for Intel Sunrisepoint
2015-07-31 19:13:33 +01:00
firmware: qcom: scm: Add HDCP Support
2015-05-28 10:47:45 -05:00
vfs: Add general support to enforce project quota limits
2015-03-18 21:55:08 +01:00
Merge branch 'quota_interface' into for_next_testing
2015-03-16 10:26:41 +01:00
random: Remove kernel blocking API
2015-06-10 19:14:04 +08:00
rbtree: Make lockless searches non-fatal
2015-05-28 11:32:04 +09:30
rbtree: Make lockless searches non-fatal
2015-05-28 11:32:04 +09:30
rbtree: Implement generic latch_tree
2015-05-28 11:32:06 +09:30
rculist: Fix another sparse warning
2015-05-27 12:58:04 -07:00
rcu: Rename rcu_lockdep_assert() to RCU_LOCKDEP_WARN()
2015-07-22 15:27:32 -07:00
rcu: Add RCU-sched flavors of get-state and cond-sync
2015-07-22 15:26:58 -07:00
rcu: Add RCU-sched flavors of get-state and cond-sync
2015-07-22 15:26:58 -07:00
kernel/reboot.c: add orderly_reboot for graceful reboot
2015-04-15 16:35:23 -07:00
regmap: Introduce regmap_get_reg_stride
2015-05-22 12:19:21 +01:00
remoteproc: add a rproc ops for performing address translation
2015-06-17 09:57:12 +03:00
rhashtable: Add cap on number of elements in hash table
2015-05-16 18:08:26 -04:00
rapidio: Fix kerneldoc and comment
2015-05-26 15:23:23 +02:00
mm: uninline and cleanup page-mapping related helpers
2015-04-15 16:35:19 -07:00
rtc: interface: Remove rtc_set_mmss()
2015-06-25 01:13:43 +02:00
switchdev; add VLAN support for port's bridge_getlink
2015-06-23 06:56:18 -07:00
lib: scatterlist: add sg splitting function
2015-08-24 14:28:01 -06:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-08-31 20:26:22 -07:00
misc: mic: SCIF header file and IOCTL interface
2015-05-24 12:13:36 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2015-06-27 13:26:03 -07:00
bitmap, cpumask, nodemask: remove dedicated formatting functions
2015-02-13 21:21:39 -08:00
vfs: add seq_file_path() helper
2015-06-23 18:01:07 -04:00
Minor merge needed, due to function move.
2015-07-01 10:49:25 -07:00
tty/early: make serial8250_early_{in,out} static again
2015-07-23 17:43:30 -07:00
serial: core: Fix unused variable warnings from uart_console()
2015-05-06 22:27:00 +02:00
serial: sh-sci: Standardize on using the BIT() macro to define register bits
2015-05-10 19:06:38 +02:00
dmaengine: shdma: use normal interface for passing slave id
2015-02-23 16:12:24 +05:30
vmscan: per memory cgroup slab shrinkers
2015-02-12 18:54:09 -08:00
flow_dissector: Use 'const' where possible.
2015-09-01 21:19:17 -07:00
Fix kmalloc slab creation sequence
2015-06-29 10:49:51 -07:00
slab: embed memcg_cache_params to kmem_cache
2015-02-12 18:54:09 -08:00
mm: slub: share object_err function
2015-02-13 21:21:41 -08:00
smp: don't use 16-bit words for atomic accesses
2015-04-20 09:08:49 -07:00
smpboot: allow excluding cpus from the smpboot threads
2015-06-24 17:49:40 -07:00
sock_diag: define destruction multicast groups
2015-06-15 19:49:22 -07:00
new helper: msg_data_left()
2015-04-11 15:53:35 -04:00
Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-09-01 08:40:25 -07:00
rcu: Reverse rcu_dereference_check() conditions
2015-03-03 11:16:47 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2015-04-14 09:50:27 -07:00
stddef.h: move offsetofend inside #ifndef/#endif guard, neaten
2015-06-25 17:00:38 -07:00
stmmac: remove setup/free glue callbacks
2015-07-29 00:13:25 -07:00
stop_machine: Use 'cpu_stop_fn_t' where possible
2015-08-03 12:21:27 +02:00
lib/string.c: introduce strreplace()
2015-06-25 17:00:40 -07:00
SCSI misc on 20150416
2015-04-16 19:02:04 -04:00
PM / sleep: Re-implement suspend-to-idle handling
2015-02-13 23:49:36 +01:00
lib: add software 842 compression/decompression
2015-05-11 15:06:43 +08:00
block: add a bi_error field to struct bio
2015-07-29 08:55:15 -06:00
mm: remove remaining references to NUMA hinting bits and helpers
2015-02-12 18:54:08 -08:00
This patch series contains several clean ups and even a new trace clock
2015-06-26 14:02:43 -07:00
sysctl: Allow creating permanently empty directories that serve as mountpoints.
2015-07-01 10:36:39 -05:00
sysfs: Add support for permanently empty directories to serve as mount points.
2015-07-01 10:36:45 -05:00
check_syslog_permissions() cleanup
2015-06-25 17:00:39 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-05-23 01:22:35 -04:00
thermal: support slope and offset coefficients
2015-05-11 19:46:52 -07:00
Revert "ti-st: add device tree support"
2015-08-05 13:24:12 -07:00
nohz: Remove useless argument on tick_nohz_task_switch()
2015-07-29 15:45:01 +02:00
time: Introduce struct itimerspec64
2015-08-17 11:25:28 -07:00
time: Prevent early expiry of hrtimers[CLOCK_REALTIME] at the leap second edge
2015-06-12 11:15:49 +02:00
Merge branch 'fortglx/4.3/time' of https://git.linaro.org/people/john.stultz/linux into timers/core
2015-08-20 21:13:22 +02:00
timer: Reduce timer migration overhead if disabled
2015-06-19 15:18:28 +02:00
timerqueue: Let timerqueue_add/del return information
2015-04-22 17:06:49 +02:00
sched/topology: Rename topology_thread_cpumask() to topology_sibling_cpumask()
2015-05-27 15:22:15 +02:00
tracing, perf: Implement BPF programs attached to uprobes
2015-08-06 15:29:14 -03:00
tracing: Add TRACE_DEFINE_ENUM() macro to map enums to their values
2015-04-08 09:39:56 -04:00
tty: core: Add tty_debug() for printk(KERN_DEBUG) messages
2015-07-23 18:37:31 -07:00
Avoid usb reset crashes by making tty_io cdevs truly dynamic
2015-08-03 15:24:43 -07:00
rcu: Create a synchronize_rcu_mult()
2015-07-22 15:27:29 -07:00
net: make u64_stats_init() a function
2015-06-15 16:02:52 -07:00
lib: introduce strncpy_from_unsafe()
2015-08-28 16:27:27 -07:00
netns: constify net_hash_mix() and various callers
2015-03-18 22:00:34 -04:00
uidgid: make uid_valid and gid_valid work with !CONFIG_MULTIUSER
2015-05-14 17:55:51 -07:00
new helper: iov_iter_rw()
2015-04-11 22:29:44 -04:00
uprobes/x86: Make arch_uretprobe_is_alive(RP_CHECK_CALL) more clever
2015-07-31 10:38:06 +02:00
Revert "usb: interface authorization: Declare authorized attribute"
2015-08-18 09:59:12 -07:00
uas: Add US_FL_MAX_SECTORS_240 flag
2015-04-28 12:48:57 +02:00
util_macros.h: have array pointer point to array of constants
2015-05-05 17:10:11 -07:00
VFIO updates for v4.1
2015-04-14 18:06:47 -07:00
vgaarb: Stub vga_set_legacy_decoding()
2015-04-07 11:14:38 -06:00
virtio: drop virtio_device_is_legacy_only
2015-04-15 12:41:14 +09:30
virtio: add explicit big-endian support to memory accessors
2015-06-01 15:48:54 +02:00
virtio: add explicit big-endian support to memory accessors
2015-06-01 15:48:54 +02:00
virtio_ring: Update weak barriers to use dma_wmb/rmb
2015-04-13 21:04:16 +09:30
kasan, module, vmalloc: rework shadow allocation for modules
2015-03-12 18:46:08 -07:00
vme: export vme_check_window()
2015-06-12 17:26:57 -07:00
virtio: add explicit big-endian support to memory accessors
2015-06-01 15:48:54 +02:00
md updates for 4.2
2015-06-29 11:10:56 -07:00
watchdog: watchdog_core: Add watchdog registration deferral mechanism
2015-06-29 11:51:06 +02:00
wlcore: remove wl12xx_platform_data
2015-03-24 09:48:14 -07:00
workqueue: fix some docbook warnings
2015-08-17 15:48:24 -04:00
writeback: implement foreign cgroup inode detection
2015-06-02 08:40:20 -06:00
zpool: remove zpool_evict()
2015-06-25 17:00:37 -07:00
zsmalloc: support compaction
2015-04-15 16:35:20 -07:00
6bb0fef489