Linus Torvalds
30c44659f4
Merge branch 'strscpy' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile ...
Pull strscpy string copy function implementation from Chris Metcalf.
Chris sent this during the merge window, but I waffled back and forth on
the pull request, which is why it's going in only now.
The new "strscpy()" function is definitely easier to use and more secure
than either strncpy() or strlcpy(), both of which are horrible nasty
interfaces that have serious and irredeemable problems.
strncpy() has a useless return value, and doesn't NUL-terminate an
overlong result. To make matters worse, it pads a short result with
zeroes, which is a performance disaster if you have big buffers.
strlcpy(), by contrast, is a mis-designed "fix" for strlcpy(), lacking
the insane NUL padding, but having a differently broken return value
which returns the original length of the source string. Which means
that it will read characters past the count from the source buffer, and
you have to trust the source to be properly terminated. It also makes
error handling fragile, since the test for overflow is unnecessarily
subtle.
strscpy() avoids both these problems, guaranteeing the NUL termination
(but not excessive padding) if the destination size wasn't zero, and
making the overflow condition very obvious by returning -E2BIG. It also
doesn't read past the size of the source, and can thus be used for
untrusted source data too.
So why did I waffle about this for so long?
Every time we introduce a new-and-improved interface, people start doing
these interminable series of trivial conversion patches.
And every time that happens, somebody does some silly mistake, and the
conversion patch to the improved interface actually makes things worse.
Because the patch is mindnumbing and trivial, nobody has the attention
span to look at it carefully, and it's usually done over large swatches
of source code which means that not every conversion gets tested.
So I'm pulling the strscpy() support because it *is* a better interface.
But I will refuse to pull mindless conversion patches. Use this in
places where it makes sense, but don't do trivial patches to fix things
that aren't actually known to be broken.
* 'strscpy' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
tile: use global strscpy() rather than private copy
string: provide strscpy()
Make asm/word-at-a-time.h available on all architectures
2015-10-04 16:31:13 +01:00
Revert "uart: pl011: Add support to ZTE ZX296702 uart"
2015-09-04 09:14:20 -07:00
bcma: switch GPIO portions to use GPIOLIB_IRQCHIP
2015-08-18 09:08:47 +03:00
libceph: advertise support for keepalive2
2015-09-17 20:14:27 +03:00
ARM: SoC driver updates for v4.3
2015-09-01 13:00:04 -07:00
fsl /bestcomm
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2015-09-04 15:49:32 -07:00
Input: atmel_mxt_ts - use deep sleep mode when stopped
2015-08-04 17:03:52 -07:00
iio: Add inverse unit conversion macros
2015-08-08 12:50:40 +01:00
ARM:
2015-09-10 16:42:49 -07:00
sound updates for 4.3-rc1
2015-09-04 11:46:02 -07:00
Changes for 4.3
2015-09-09 08:33:31 -07:00
IB/mlx5: Remove support for IB_DEVICE_LOCAL_DMA_LKEY
2015-09-25 10:46:51 -04:00
mmc: block: skip trim for some kingston eMMCs
2015-08-27 14:50:52 +02:00
arch, drivers: don't include <asm/io.h> directly, use <linux/io.h> instead
2015-08-10 23:07:05 -04:00
netfilter: nf_conntrack: make nf_ct_zone_dflt built-in
2015-09-02 16:32:56 -07:00
arm: perf: factor arm_pmu core out to drivers
2015-07-31 15:01:14 +01:00
MMC core:
2015-09-08 16:33:16 -07: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: SoC driver updates for v4.3
2015-09-01 13:00:04 -07:00
spi: fix kernel-doc warnings in spi.h
2015-09-16 20:44:47 +01:00
SUNRPC: Ensure that we wait for connections to complete before retrying
2015-09-17 18:01:28 -04:00
Revert "usb: interface authorization: Introduces the default interface authorization"
2015-08-18 09:58:45 -07:00
ACPI, PCI, irq: Do not share PCI IRQ with ISA IRQ
2015-09-26 01:53:07 +02:00
ASN.1: Handle 'ANY OPTIONAL' in grammar
2015-08-05 13:38:07 +01: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
locking/atomics: Add _{acquire|release|relaxed}() variants of some atomic operations
2015-08-12 11:58:59 +02:00
audit: implement audit by executable
2015-08-06 16:17:25 -04:00
average: remove out-of-line implementation
2015-08-20 14:10:23 -07:00
cgroup, writeback: don't enable cgroup writeback on traditional hierarchies
2015-09-24 16:48:52 -04:00
gpio: generic: support input-only chips
2015-07-27 15:01:05 +02: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
blkcg: use CGROUP_WEIGHT_* scale for io.weight on the unified hierarchy
2015-08-18 15:49:36 -07:00
blk-mq: factor out a helper to iterate all tags for a request_queue
2015-10-01 10:10:57 +02:00
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
2015-09-03 12:28:30 -07:00
blk-mq: fix sysfs registration/unregistration race
2015-09-29 11:32:45 -06:00
bpf: Implement function bpf_perf_event_read() that get the selected hardware PMU conuter
2015-08-09 22:50:06 -07:00
Revert "sched, cgroup: replace signal_struct->group_rwsem with a global percpu_rwsem"
2015-09-16 11:51:12 -04: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/blkcg' of git://git.kernel.dk/linux-block
2015-09-10 18:56:14 -07:00
clk: Constify clk_hw argument to provider APIs
2015-08-24 16:49:11 -07:00
clockevents: Remove unused set_mode() callback
2015-09-14 11:00:55 +02:00
locking, compiler.h: Cast away attributes in the WRITE_ONCE() magic
2015-08-12 11:58:58 +02:00
coresight: Fix implicit inclusion of linux/sched.h
2015-08-05 13:30:16 -07:00
cpufreq: acpi-cpufreq: Use cpufreq_cpu_get_raw() in ->get()
2015-09-16 02:17:49 +02:00
cpuidle/coupled: Remove cpuidle_device::safe_state_index
2015-08-28 15:14:54 +02:00
capabilities: ambient capabilities
2015-09-04 16:54:41 -07:00
crypto: aead - Remove CRYPTO_ALG_AEAD_NEW flag
2015-08-17 16:53:53 +08:00
dax: add huge page fault support
2015-09-08 15:35:28 -07:00
PM / devfreq: comments for get_dev_status usage updated
2015-09-11 14:23:29 +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
dmaengine: Stricter legacy checking in dma_request_slave_channel_compat()
2015-08-20 12:01:03 +05:30
mm: add dma_pool_zalloc() call to DMA API
2015-09-08 15:35:28 -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: add annotation for space utilization of regular/inline dentry
2015-08-21 22:45:13 -07:00
fbdev: fix cea_modes array size
2015-08-20 10:20:11 +03: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
dax: move DAX-related functions to a new header
2015-09-08 15:35:28 -07:00
drivers: usb: fsl: Workaround for USB erratum-A005275
2015-08-14 16:50:36 -07:00
fsl_ifc: Change IO accessor based on endianness
2015-08-07 22:59:34 -05:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2015-09-05 20:34:28 -07:00
ftrace: Fix breakage of set_ftrace_pid
2015-07-24 13:58:14 -04:00
genalloc: add support of multiple gen_pools per device
2015-09-04 16:54:41 -07:00
mm: use numa_mem_id() in alloc_pages_node()
2015-09-08 15:35:28 -07:00
dax: don't use set_huge_zero_page()
2015-09-08 15:35:28 -07:00
hugetlbfs: add hugetlbfs_fallocate()
2015-09-08 15:35:28 -07:00
Drivers: hv: vmbus: Further improve CPU affiliation logic
2015-08-05 11:44:28 -07:00
i2c: core: Add support for best effort block read emulation
2015-08-24 14:05:19 +02:00
mac80211: fix BIT position for TDLS WIDE extended cap
2015-08-14 17:49:53 +02:00
IGMP: Inhibit reports for local multicast groups
2015-08-28 13:28:47 -07:00
Revert "sched, cgroup: replace signal_struct->group_rwsem with a global percpu_rwsem"
2015-09-16 11:51:12 -04:00
iommu/vt-d: Split up iommu->domains array
2015-08-12 16:23:33 +02:00
arch, drivers: don't include <asm/io.h> directly, use <linux/io.h> instead
2015-08-10 23:07:05 -04:00
add devm_memremap_pages
2015-08-27 19:40:58 -04:00
iommu: iova: Move iova cache management to the iova library
2015-07-28 15:47:58 +01:00
ipmi: Don't flush messages in sender() in run-to-completion mode
2015-09-03 15:02:28 -05:00
net: ipv6 sysctl option to ignore routes when nexthop link is down
2015-08-13 21:27:19 -07:00
genirq: Remove irq argument from irq flow handlers
2015-09-16 15:47:51 +02:00
genirq: Remove irq argument from irq flow handlers
2015-09-16 15:47:51 +02:00
genirq: Add DOMAIN_BUS_NEXUS irqdomain property
2015-07-30 00:14:38 +02:00
genirq: Remove irq argument from irq flow handlers
2015-09-16 15:47:51 +02:00
Pretty much all bug fixes and clean ups for 4.3, after a lot of
2015-09-03 12:52:19 -07: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
locking/static_keys: Fix up the static keys documentation
2015-09-15 07:12:06 +02:00
x86/kasan, mm: Introduce generic kasan_populate_zero_shadow()
2015-08-22 14:54:55 +02:00
kernfs: implement kernfs_path_len()
2015-08-18 15:49:15 -07:00
kexec: split kexec_load syscall from kexec core code
2015-09-10 13:29:01 -07:00
klist: implement klist_prev()
2015-07-28 08:50:42 +01:00
kmod: use system_unbound_wq instead of khelper
2015-09-10 13:29:01 -07:00
perf/x86/hw_breakpoints: Disallow kernel breakpoints unless kprobe-safe
2015-08-04 10:16:54 +02:00
kernel/kthread.c:kthread_create_on_node(): clarify documentation
2015-09-04 16:54:41 -07:00
KVM: make halt_poll_ns per-vCPU
2015-09-06 16:27:10 +02:00
libnvdimm, pmem: direct map legacy pmem by default
2015-08-28 23:40:05 -04:00
inode: add hlist_fake to avoid the inode hash lock in evict
2015-08-17 18:39:45 -04:00
locking, include/llist: Use linux/atomic.h instead of asm/cmpxchg.h
2015-08-12 11:59:08 +02:00
Yama: remove needless CONFIG_SECURITY_YAMA_STACKED
2015-07-28 13:18:19 +10:00
mailbox: switch to hrtimer for tx_complete polling
2015-08-10 14:29:27 +05:30
mei: bus: add and call callback on notify event
2015-08-03 17:30:00 -07:00
mem-hotplug: handle node hole when initializing numa_meminfo.
2015-09-08 15:35:28 -07:00
memcg: remove pcp_counter_lock
2015-10-01 21:42:35 -04:00
mm: ZONE_DEVICE for "device memory"
2015-08-27 19:40:58 -04:00
add microchip LAN88xx phy driver
2015-09-09 17:19:14 -07:00
char: make misc_deregister a void function
2015-08-05 10:35:49 -07:00
memcg: fix dirty page migration
2015-10-01 21:42:35 -04:00
mm: drop __nocast from vm_flags_t definition
2015-09-08 15:35:28 -07:00
mm: introduce idle page tracking
2015-09-10 13:29:01 -07:00
libnvdimm for 4.3:
2015-09-08 14:35:59 -07:00
mod_devicetable: add space before */
2015-08-07 15:03:42 +02:00
PCI/MSI: Drop domain field from msi_controller
2015-07-30 00:14:39 +02:00
net_dbg_ratelimited: turn into no-op when !DEBUG
2015-08-06 23:51:30 -07:00
netpoll: Close race condition between poll_one_napi and napi_disable
2015-09-23 14:32:50 -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: 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
pnfs: move common blocklayout XDR defintions to nfs4.h
2015-08-17 13:22:49 -05:00
NFS: Remove nfs_release()
2015-08-17 13:32:56 -05:00
NFS: Get suppattr_exclcreat when getting server capabilities
2015-08-27 19:45:27 -04:00
NFSv4: Express delegation limit in units of pages
2015-09-07 12:36:13 -04:00
Merge branch 'nmi' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
2015-09-08 12:28:10 -07:00
NTB: Fix documentation for ntb_peer_db_clear.
2015-09-07 15:17:09 -04:00
NTB: Add flow control to the ntb_netdev
2015-09-07 15:17:08 -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
gpio: defer probe if pinctrl cannot be found
2015-07-28 13:55:36 +02:00
of/platform: Assign MSI domain to platform device
2015-07-30 00:14:37 +02:00
of/platform: add function to populate default bus
2015-08-25 11:29:55 -05:00
PKCS#7: Add OIDs for sha224, sha284 and sha512 hash algos and use them
2015-09-01 09:59:20 +10:00
mm, oom: add description of struct oom_control
2015-09-08 15:35:28 -07:00
mm: introduce idle page tracking
2015-09-10 13:29:01 -07:00
mm, page_isolation: make set/unset_migratetype_isolate() file-local
2015-09-08 15:35:28 -07:00
mm: introduce idle page tracking
2015-09-10 13:29:01 -07:00
mm: introduce idle page tracking
2015-09-10 13:29:01 -07:00
PCI: Move ATS declarations to linux/pci.h so they're all together
2015-08-13 15:59:58 -05:00
pci: mm: add pci_pool_zalloc() call
2015-09-08 15:35:28 -07:00
[media] tw68: Move PCI vendor and device IDs to pci_ids.h
2015-08-16 13:26:01 -03:00
percpu-rwsem: introduce percpu_rwsem_release() and percpu_rwsem_acquire()
2015-08-15 13:52:10 +02:00
perf: add the necessary core perf APIs when accessing events counters in eBPF programs
2015-08-09 22:50:05 -07:00
phy: add phy_device_remove()
2015-09-24 23:04:53 -07:00
phy: fixed_phy: Add gpio to determine link up/down.
2015-08-31 14:48:02 -07:00
PM / Domains: Remove unusable governor dummies
2015-08-29 01:54:43 +02:00
PM / OPP: add dev_pm_opp_get_suspend_opp() helper
2015-09-09 02:20:39 +02:00
PM / QoS: Make it possible to expose device latency tolerance to userspace
2015-07-28 08:50:41 +01:00
x86, pmem: clarify that ARCH_HAS_PMEM_API implies PMEM mapped WB
2015-08-27 19:40:59 -04:00
include/linux/poison.h: remove not-used poison pointer macros
2015-09-10 13:29:01 -07:00
sched/preempt: Fix cond_resched_lock() and cond_resched_softirq()
2015-08-03 12:21:24 +02:00
hexdump: do not print debug dumps for !CONFIG_DEBUG
2015-09-10 13:29:01 -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
arm64: psci: factor invocation code to drivers
2015-08-03 12:33:39 +01:00
pwm: Clean up kerneldoc
2015-08-17 15:40:20 +02:00
spi: pxa2xx: Add support for Intel Sunrisepoint
2015-07-31 19:13:33 +01:00
quota: Propagate error from ->acquire_dquot()
2015-07-23 20:59:10 +02:00
rcu: Change _wait_rcu_gp() to work around GCC bug 67055
2015-09-20 20:50:06 -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
Merge remote-tracking branches 'regmap/topic/lockdep' and 'regmap/topic/seq-delay' into regmap-next
2015-09-04 17:22:10 +01:00
reset: Add (devm_)reset_control_get stub functions
2015-09-01 09:56:58 +02:00
mm: send one IPI per CPU to TLB flush all entries after unmapping pages
2015-09-04 16:54:41 -07:00
lib: scatterlist: add sg splitting function
2015-08-24 14:28:01 -06:00
Revert "sched, cgroup: replace signal_struct->group_rwsem with a global percpu_rwsem"
2015-09-16 11:51:12 -04:00
security: fix typo in security_task_prctl
2015-09-20 17:00:26 -07:00
fs/seq_file: convert int seq_vprint/seq_printf/etc... returns to void
2015-09-11 15:21:34 -07:00
tty/early: make serial8250_early_{in,out} static again
2015-07-23 17:43:30 -07:00
dmaengine: shdma: Make dummy shdma_chan_filter() always return false
2015-08-05 08:48:00 +05:30
skbuff: Fix skb checksum partial check.
2015-09-29 16:48:46 -07:00
slab: infrastructure for bulk object allocation and freeing
2015-09-04 16:54:41 -07:00
smpboot: allow passing the cpumask on per-cpu thread registration
2015-09-04 16:54:41 -07: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
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
string: provide strscpy()
2015-09-10 15:36:59 -04:00
lib/string_helpers: rename "esc" arg to "only"
2015-09-10 13:29:01 -07:00
mm: swap: zswap: maybe_preload & refactoring
2015-09-08 15:35:28 -07:00
mm/hwpoison: fix race between soft_offline_page and unpoison_memory
2015-09-08 15:35:28 -07:00
sys_membarrier(): system-wide memory barrier (generic, x86)
2015-09-11 15:21:34 -07:00
thermal: Add a function to get the minimum power
2015-09-14 07:39:46 -07:00
Revert "ti-st: add device tree support"
2015-08-05 13:24:12 -07:00
nohz: Affine unpinned timers to housekeepers
2015-09-02 10:33:22 +02:00
time: Introduce struct itimerspec64
2015-08-17 11:25:28 -07: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
tracing, perf: Implement BPF programs attached to uprobes
2015-08-06 15:29:14 -03: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
lib: introduce strncpy_from_unsafe()
2015-08-28 16:27:27 -07: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
userfaultfd: mcopy_atomic|mfill_zeropage: UFFDIO_COPY|UFFDIO_ZEROPAGE preparation
2015-09-04 16:54:41 -07:00
PKCS#7: Appropriately restrict authenticated attributes and content type
2015-08-12 17:01:01 +01:00
userfaultfd: revert "userfaultfd: waitqueue: add nr wake parameter to __wake_up_locked_key"
2015-09-22 15:09:53 -07:00
kernel/watchdog: move NMI function header declarations from watchdog.h to nmi.h
2015-09-04 16:54:41 -07:00
workqueue: fix some docbook warnings
2015-08-17 15:48:24 -04:00
mm: zbud: constify the zbud_ops
2015-09-08 15:35:28 -07:00
zpool: add zpool_has_pool()
2015-09-10 13:29:01 -07:00
zsmalloc: account the number of compacted pages
2015-09-08 15:35:28 -07:00
