Rasmus Villemoes
41416f2330
lib/string_helpers.c: change semantics of string_escape_mem ...
The current semantics of string_escape_mem are inadequate for one of its
current users, vsnprintf(). If that is to honour its contract, it must
know how much space would be needed for the entire escaped buffer, and
string_escape_mem provides no way of obtaining that (short of allocating a
large enough buffer (~4 times input string) to let it play with, and
that's definitely a big no-no inside vsnprintf).
So change the semantics for string_escape_mem to be more snprintf-like:
Return the size of the output that would be generated if the destination
buffer was big enough, but of course still only write to the part of dst
it is allowed to, and (contrary to snprintf) don't do '\0'-termination.
It is then up to the caller to detect whether output was truncated and to
append a '\0' if desired. Also, we must output partial escape sequences,
otherwise a call such as snprintf(buf, 3, "%1pE", "\123") would cause
printf to write a \0 to buf[2] but leaving buf[0] and buf[1] with whatever
they previously contained.
This also fixes a bug in the escaped_string() helper function, which used
to unconditionally pass a length of "end-buf" to string_escape_mem();
since the latter doesn't check osz for being insanely large, it would
happily write to dst. For example, kasprintf(GFP_KERNEL, "something and
then %pE", ...); is an easy way to trigger an oops.
In test-string_helpers.c, the -ENOMEM test is replaced with testing for
getting the expected return value even if the buffer is too small. We
also ensure that nothing is written (by relying on a NULL pointer deref)
if the output size is 0 by passing NULL - this has to work for
kasprintf("%pE") to work.
In net/sunrpc/cache.c, I think qword_add still has the same semantics.
Someone should definitely double-check this.
In fs/proc/array.c, I made the minimum possible change, but longer-term it
should stop poking around in seq_file internals.
[andriy.shevchenko@linux.intel.com: simplify qword_add]
[andriy.shevchenko@linux.intel.com: add missed curly braces]
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2015-04-15 16:35:24 -07:00
fonts: Add 6x10 font
2014-10-09 11:35:48 +03:00
lib/lz4: Pull out constant tables
2015-03-25 15:04:57 +01:00
lzo: check for length overrun in variable length encoding.
2014-09-28 11:08:01 +02:00
MPILIB: Fix comparison of negative MPIs
2015-01-14 16:10:12 +00:00
x86/raid6: correctly check for assembler capabilities
2015-02-04 08:35:51 +11:00
lib/xz: enable all filters by default in Kconfig
2014-06-04 16:54:18 -07:00
zlib: clean up some dead code
2014-08-06 18:01:24 -07:00
zlib: clean up some dead code
2014-08-06 18:01:24 -07:00
X.509: Implement simple static OID registry
2012-10-08 13:50:18 +10:30
argv_split(): teach it to handle mutable strings
2013-04-29 18:28:19 -07:00
lib/asn1_decoder.c: kernel-doc warning fix
2014-06-04 16:54:19 -07:00
assoc_array: Include rcupdate.h for call_rcu() definition
2015-01-07 16:08:41 +00:00
locking,arch: Rewrite generic atomic support
2014-08-14 12:48:14 +02:00
lib/atomic64_test.c: convert printk(KERN_INFO to pr_info
2014-06-04 16:54:19 -07:00
syscalls: implement execveat() system call
2014-12-13 12:42:51 -08:00
lib: Ensure EWMA does not store wrong intermediate values
2014-01-16 23:46:06 -08:00
usb/core: use bin2bcd() for bcdDevice in RH
2012-09-10 11:13:16 -07:00
bitmap, cpumask, nodemask: remove dedicated formatting functions
2015-02-13 21:21:39 -08:00
ARM: 8187/1: add CONFIG_HAVE_ARCH_BITREVERSE to support rbit instruction
2014-12-22 16:43:06 +00:00
lib: reduce the use of module.h wherever possible
2012-03-07 15:04:04 -05:00
lib/btree.c: fix leak of whole btree nodes
2014-06-04 16:54:18 -07:00
lib/bug: Use RCU list ops for module_bug_list
2014-11-11 17:07:46 +10:30
X.509: do not emit any informational output
2013-06-19 17:54:06 +02:00
printk: Provide a wake_up_klogd() off-case
2013-03-22 16:41:20 -07:00
lib: reduce the use of module.h wherever possible
2012-03-07 15:04:04 -05:00
lib/checksum.c: fix build for generic csum_tcpudp_nofold
2015-01-29 11:57:38 -08:00
lib/clz_ctz.c: add prototype declarations in lib/clz_ctz.c
2014-04-03 16:21:12 -07:00
lib: Fix multiple definitions of clz_tab
2012-02-02 10:34:23 +11:00
lib: Add a generic cmdline parse function parse_option_str
2014-10-03 18:40:58 +01:00
audit: Add generic compat syscall support
2014-03-20 10:11:35 -04:00
Docs: wording: functions -> algorithm
2011-10-29 21:20:22 +02:00
cpu: rewrite cpu-notifier-error-inject module
2012-07-30 17:25:22 -07:00
Remove GENERIC_HARDIRQ config option
2013-09-13 15:09:52 +02:00
lib/cpumask: cpumask_set_cpu_local_first to use all cores when numa node is not defined
2014-07-02 18:29:23 -07:00
crypto: crct10dif - Add fallback for broken initrds
2013-09-12 15:31:34 +10:00
lib/crc7: Shift crc7() output left 1 bit
2014-05-16 14:26:52 -04:00
lib: crc32: Add some additional __pure annotations
2014-06-25 16:04:00 -07:00
crc32: select an algorithm via Kconfig
2012-03-23 16:58:38 -07:00
lib: reduce the use of module.h wherever possible
2012-03-07 15:04:04 -05:00
mutex: Add support for wound/wait style locks
2013-06-26 12:10:56 +02:00
lib/debugobjects.c: convert printk(KERN_DEBUG to pr_debug
2014-06-04 16:53:53 -07:00
lib: reduce the use of module.h wherever possible
2012-03-07 15:04:04 -05:00
lib/decompress.c: consistency of compress formats for kernel image
2014-12-13 12:42:52 -08:00
decompress_bunzip2: off by one in get_next_block()
2014-12-13 12:42:52 -08:00
initramfs: support initramfs that is bigger than 2GiB
2014-08-08 15:57:26 -07:00
initramfs: support initramfs that is bigger than 2GiB
2014-08-08 15:57:26 -07:00
initramfs: support initramfs that is bigger than 2GiB
2014-08-08 15:57:26 -07:00
initramfs: support initramfs that is bigger than 2GiB
2014-08-08 15:57:26 -07:00
initramfs: support initramfs that is bigger than 2GiB
2014-08-08 15:57:26 -07:00
devres: support sizes greater than an unsigned long
2014-11-07 10:09:07 -08:00
lib/digsig.c: kernel-doc warning fixes
2014-06-04 16:54:19 -07:00
lib: correct link to the original source for div64_u64
2015-03-06 23:19:27 +01:00
dma-debug: prevent early callers from crashing
2014-12-10 17:41:02 -08:00
asmlinkage: Add explicit __visible to drivers/*, lib/*, kernel/*
2014-05-05 16:07:46 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2015-02-10 18:57:15 -08:00
lib/dynamic_queue_limits.c: simplify includes
2015-02-12 18:54:15 -08:00
earlycpio.c: Fix the confusing comment of find_cpio_data().
2013-08-14 23:24:01 +02:00
fault-inject: add ratelimit option
2014-12-13 12:42:52 -08:00
of/lib: Allow scripts/dtc/libfdt to be used from kernel code
2012-07-23 13:54:52 +01:00
lib: add fdt_empty_tree.c
2014-04-30 19:49:37 +01:00
of/lib: Allow scripts/dtc/libfdt to be used from kernel code
2012-07-23 13:54:52 +01:00
of/lib: Allow scripts/dtc/libfdt to be used from kernel code
2012-07-23 13:54:52 +01:00
of/lib: Allow scripts/dtc/libfdt to be used from kernel code
2012-07-23 13:54:52 +01:00
of/lib: Allow scripts/dtc/libfdt to be used from kernel code
2012-07-23 13:54:52 +01:00
of/lib: Allow scripts/dtc/libfdt to be used from kernel code
2012-07-23 13:54:52 +01:00
lib: reduce the use of module.h wherever possible
2012-03-07 15:04:04 -05:00
lib: reduce the use of module.h wherever possible
2012-03-07 15:04:04 -05:00
reciprocal_divide: update/correction of the algorithm
2014-01-21 23:17:20 -08:00
proportions: add @gfp to init functions
2014-09-08 09:51:30 +09:00
lib/gcd.c: prevent possible div by 0
2012-10-06 03:04:57 +09:00
lib: crc32: constify crc32 lookup table
2015-02-13 21:21:35 -08:00
lib/genalloc.c: check result of devres_alloc()
2015-02-13 21:21:36 -08:00
lib/glob.c: add CONFIG_GLOB_SELFTEST
2014-08-06 18:01:25 -07:00
lib/halfmd4.c: simplify includes
2015-02-12 18:54:15 -08:00
hexdump: make it return number of bytes placed in buffer
2015-02-12 18:54:15 -08:00
Make ARCH_HAS_FAST_MULTIPLIER a real config variable
2014-09-13 11:14:53 -07:00
lib/idr.c: remove redundant include
2015-02-12 18:54:15 -08:00
lib/int_sqrt.c: optimize square root algorithm
2013-04-29 18:28:19 -07:00
lib/interval_tree.c: simplify includes
2015-02-12 18:54:15 -08:00
lib: Export interval_tree
2014-05-05 09:09:14 +02:00
Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP
2014-04-07 16:36:11 -07:00
lib: reduce the use of module.h wherever possible
2012-03-07 15:04:04 -05:00
The following text was taken from the original review request:
2012-03-24 10:24:31 -07:00
x86, mm: support huge KVA mappings on x86
2015-04-14 16:49:04 -07:00
Merge branch 'iov_iter' into for-next
2015-04-11 22:26:51 -04:00
lib: reduce the use of module.h wherever possible
2012-03-07 15:04:04 -05:00
ddr: add LPDDR2 data from JESD209-2
2012-05-02 00:04:06 -07:00
lib/kasprintf.c: use kmalloc_track_caller() to get accurate traces for kvasprintf
2012-10-11 08:50:15 +09:00
Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
2015-02-19 10:36:45 -08:00
Merge branch 'akpm' (patches from Andrew)
2015-04-14 16:49:17 -07:00
kasan: enable instrumentation of global variables
2015-02-13 21:21:42 -08:00
kdb: Allow access to sensitive commands to be restricted by default
2014-11-11 09:31:52 -06:00
kfifo: use BUG_ON
2014-08-08 15:57:25 -07:00
klist: use same naming scheme as hlist for klist_add_after()
2014-08-06 18:01:24 -07:00
kobject: WARN as tip when call kobject_get() to a kobject not initialized
2015-03-25 15:26:49 +01:00
lib/kobject_uevent.c: remove redundant include
2015-02-12 18:54:15 -08:00
lib/kstrtox.c: remove redundant cleanup
2014-01-23 16:36:57 -08:00
lib/kstrtox: common code between kstrto*() and simple_strto*() functions
2011-10-31 17:30:56 -07:00
block: fix blk_stack_limits() regression due to lcm() change
2015-03-31 09:45:50 -06:00
crypto: LLVMLinux: Remove VLAIS usage from libcrc32c.c
2014-10-14 10:51:23 +02:00
rcu: Fix broken strings in RCU's source code.
2012-07-06 06:01:49 -07:00
lib/list_sort.c: rearrange includes
2015-02-12 18:54:15 -08:00
lib/llist.c: remove redundant include
2015-02-12 18:54:15 -08:00
locking/lockdep: Revert qrwlock recusive stuff
2014-10-03 06:09:30 +02:00
locking: Remove ACCESS_ONCE() usage
2015-02-24 08:44:16 +01:00
drbd: debugfs: add per volume oldest_requests
2014-07-10 18:35:19 +02:00
move iov_iter.c from mm/ to lib/
2015-02-17 22:22:17 -05:00
lib/md5.c: simplify include
2015-02-12 18:54:15 -08:00
memory: memory notifier error injection module
2012-07-30 17:25:22 -07:00
string: introduce memweight()
2012-07-30 17:25:16 -07:00
mac_pton: Use bool not int return
2014-06-25 17:45:43 -07:00
netlink: pad nla_memcpy dest buffer with zeroes
2015-03-31 14:07:24 -04:00
mode_t, whack-a-mole at 11...
2013-04-09 14:13:05 -04:00
fault-injection: notifier error injection
2012-07-30 17:25:22 -07:00
powerpc+of: Rename and fix OF reconfig notifier error inject module
2012-12-14 10:32:52 +11:00
Give the OID registry file module info to avoid kernel tainting
2013-05-05 14:38:00 -07:00
lib/parser.c: put EXPORT_SYMBOLs in the conventional place
2014-01-23 16:36:55 -08:00
pci: add pci_iomap_range
2015-01-21 16:28:49 +10:30
percpu_ref: make INIT_ATOMIC and switch_to_atomic() sticky
2014-09-24 13:31:50 -04:00
percpu_counter: add @gfp to percpu_counter_init()
2014-09-08 09:51:29 +09:00
lib/percpu_ida.c: remove redundant includes
2015-02-12 18:54:16 -08:00
percpu: add test module for various percpu operations
2013-11-13 12:09:11 +09:00
lib/plist.c: remove redundant include
2015-02-12 18:54:16 -08:00
PM: PM notifier error injection module
2012-07-30 17:25:22 -07:00
proportions: add @gfp to init functions
2014-09-08 09:51:30 +09:00
lib/radix-tree.c: change to simpler include
2015-02-12 18:54:16 -08:00
random32: improvements to prandom_bytes
2014-08-24 18:36:01 -07:00
lib: reduce the use of module.h wherever possible
2012-03-07 15:04:04 -05:00
lib: Change mail address of Oskar Schirmer
2012-05-17 15:18:37 +02:00
lib/rbtree.c: fix typo in comment of __rb_insert()
2014-08-08 15:57:24 -07:00
rbtree/test: test rbtree_postorder_for_each_entry_safe()
2014-01-23 16:37:03 -08:00
reciprocal_divide: update/correction of the algorithm
2014-01-21 23:17:20 -08:00
rhashtable: provide len to obj_hashfn
2015-03-25 17:18:33 +01:00
lib/scatterlist: fix memory leak with scsi-mq
2014-10-28 10:27:10 -06:00
seq_buf: Fix seq_buf_bprintf() truncation
2015-03-04 23:40:19 -05:00
lib: EXPORT_SYMBOL sha_init
2015-03-23 22:12:08 -04:00
lib/show_mem.c: remove redundant include
2015-02-12 18:54:16 -08:00
percpu: add preemption checks to __this_cpu ops
2014-04-07 16:36:14 -07:00
lib/sort.c: move include inside #if 0
2015-02-12 18:54:16 -08:00
lib/stmp_device.c: replace module.h include
2015-02-12 18:54:16 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2015-02-14 09:47:01 -08:00
lib/string_helpers.c: change semantics of string_escape_mem
2015-04-15 16:35:24 -07:00
lib/strncpy_from_user.c: replace module.h include
2015-02-12 18:54:16 -08:00
lib: Fix generic strnlen_user for 32-bit big-endian machines
2012-05-27 20:59:46 -07:00
swiotlb: don't assume PA 0 is invalid
2014-06-20 16:04:32 -04:00
lib/syscall.c: unexport task_current_syscall()
2014-04-03 16:21:06 -07:00
lib/test-hexdump.c: fix initconst confusion
2015-04-15 16:35:22 -07:00
lib/test-kstrtox.c: use ARRAY_SIZE instead of sizeof/sizeof[0]
2014-08-06 18:01:25 -07:00
lib/string_helpers.c: change semantics of string_escape_mem
2015-04-15 16:35:24 -07:00
test: bpf: expand DIV_KX to DIV_MOD_KX
2014-12-08 20:23:22 -05:00
test: add firmware_class loader test
2014-07-17 18:44:19 -07:00
lib: add kasan test module
2015-02-13 21:21:41 -08:00
test: add minimal module for verification testing
2014-01-23 16:36:57 -08:00
test_rhashtable: Remove bogus max_size setting
2015-04-03 15:09:36 -04:00
test: check copy_to/from_user boundary validation
2014-01-23 16:36:57 -08:00
lib/textsearch.c: remove textsearch_put reference from comments
2014-10-14 02:18:14 +02:00
The following text was taken from the original review request:
2012-03-24 10:24:31 -07:00
Move utf16 functions to kernel core and rename
2013-04-15 21:23:03 +01:00
Kconfig: consolidate CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
2013-04-30 17:04:09 -07:00
uuid: use prandom_bytes()
2013-04-29 18:28:42 -07:00
lib/string_helpers.c: change semantics of string_escape_mem
2015-04-15 16:35:24 -07:00
41416f2330