David Howells
23fd78d764
KEYS: Fix multiple key add into associative array ...
If sufficient keys (or keyrings) are added into a keyring such that a node in
the associative array's tree overflows (each node has a capacity N, currently
16) and such that all N+1 keys have the same index key segment for that level
of the tree (the level'th nibble of the index key), then assoc_array_insert()
calls ops->diff_objects() to indicate at which bit position the two index keys
vary.
However, __key_link_begin() passes a NULL object to assoc_array_insert() with
the intention of supplying the correct pointer later before we commit the
change. This means that keyring_diff_objects() is given a NULL pointer as one
of its arguments which it does not expect. This results in an oops like the
attached.
With the previous patch to fix the keyring hash function, this can be forced
much more easily by creating a keyring and only adding keyrings to it. Add any
other sort of key and a different insertion path is taken - all 16+1 objects
must want to cluster in the same node slot.
This can be tested by:
r=`keyctl newring sandbox @s`
for ((i=0; i<=16; i++)); do keyctl newring ring$i $r; done
This should work fine, but oopses when the 17th keyring is added.
Since ops->diff_objects() is always called with the first pointer pointing to
the object to be inserted (ie. the NULL pointer), we can fix the problem by
changing the to-be-inserted object pointer to point to the index key passed
into assoc_array_insert() instead.
Whilst we're at it, we also switch the arguments so that they are the same as
for ->compare_object().
BUG: unable to handle kernel NULL pointer dereference at 0000000000000088
IP: [<ffffffff81191ee4>] hash_key_type_and_desc+0x18/0xb0
...
RIP: 0010:[<ffffffff81191ee4>] hash_key_type_and_desc+0x18/0xb0
...
Call Trace:
[<ffffffff81191f9d>] keyring_diff_objects+0x21/0xd2
[<ffffffff811f09ef>] assoc_array_insert+0x3b6/0x908
[<ffffffff811929a7>] __key_link_begin+0x78/0xe5
[<ffffffff81191a2e>] key_create_or_update+0x17d/0x36a
[<ffffffff81192e0a>] SyS_add_key+0x123/0x183
[<ffffffff81400ddb>] tracesys+0xdd/0xe2
Signed-off-by: David Howells <dhowells@redhat.com>
Tested-by: Stephen Gallagher <sgallagh@redhat.com>
2013-12-02 11:24:18 +00:00
lib: Move fonts from drivers/video/console/ to lib/fonts/
2013-06-28 10:28:22 +02:00
lz4: fix compression/decompression signedness mismatch
2013-09-11 15:59:45 -07:00
lib/lzo: Update LZO compression to current upstream version
2013-02-20 19:36:01 +01:00
MPILIB: add module description and license
2013-09-25 17:17:01 +01:00
md update for v3.12
2013-09-10 13:03:41 -07:00
decompressors: fix typo "POWERPC"
2013-03-13 15:21:48 -07:00
zlib: slim down zlib_deflate() workspace when possible
2011-03-22 17:44:17 -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
Nothing all that exciting; a new module-from-fd syscall for those who want
2012-12-19 07:55:08 -08:00
KEYS: Fix multiple key add into associative array
2013-12-02 11:24:18 +00:00
lib: atomic64: Initialize locks statically to fix early users
2012-12-20 13:50:16 -08:00
atomic64_test: simplify the #ifdef for atomic64_dec_if_positive() test
2012-07-30 17:25:16 -07:00
audit: support the "standard" <asm-generic/unistd.h>
2011-05-04 14:41:28 -04:00
lib: reduce the use of module.h wherever possible
2012-03-07 15:04:04 -05:00
usb/core: use bin2bcd() for bcdDevice in RH
2012-09-10 11:13:16 -07:00
lib: add shared BCH ECC library
2011-03-11 14:25:50 +00:00
propagate name change to comments in kernel source
2012-12-06 10:39:54 +01:00
lib: reduce the use of module.h wherever possible
2012-03-07 15:04:04 -05:00
btree: catch NULL value before it does harm
2012-06-07 14:43:55 -07:00
taint: add explicit flag to show whether lock dep is still OK.
2013-01-21 17:17:57 +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
asm-generic headers: Allow yet more arch overrides in checksum.h
2013-02-11 20:00:33 +05:30
lib: add weak clz/ctz functions
2013-07-09 10:33:30 -07:00
lib: Fix multiple definitions of clz_tab
2012-02-02 10:34:23 +11:00
lib: reduce the use of module.h wherever possible
2012-03-07 15:04:04 -05: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
bootmem: fix wrong call parameter for free_bootmem()
2012-12-11 17:22:28 -08:00
crypto: crct10dif - Add fallback for broken initrds
2013-09-12 15:31:34 +10:00
lib: crc8: add new library module providing crc8 algorithm
2011-06-03 15:01:06 -04:00
lib: crc32: reduce number of cases for crc32{, c}_combine
2013-11-04 15:27:08 -05: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: remove unnecessary work pending test
2013-11-13 12:09:22 +09:00
lib: reduce the use of module.h wherever possible
2012-03-07 15:04:04 -05:00
lib: add support for LZ4-compressed kernel
2013-07-09 10:33:30 -07:00
decompress_bunzip2: remove invalid vi modeline
2011-12-06 10:00:05 +01:00
lib/decompressors: fix "no limit" output buffer length
2013-09-11 15:58:38 -07:00
lib: add support for LZ4-compressed kernel
2013-07-09 10:33:30 -07:00
treewide: Fix comment and string typo 'bufer'
2011-12-06 09:53:40 +01:00
lib/lzo: Rename lzo1x_decompress.c to lzo1x_decompress_safe.c
2013-02-20 19:36:00 +01:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
lib/devres.c: fix misplaced #endif
2013-02-27 19:10:09 -08:00
lib/digsig.c: use ERR_CAST inlined function instead of ERR_PTR(PTR_ERR(...))
2013-11-13 12:09:22 +09:00
math64: New separate div64_u64_rem helper
2013-08-23 09:02:14 -04:00
dma-debug: update DMA debug API to better handle multiple mappings of a buffer
2013-03-22 16:41:20 -07:00
x86, asmlinkage: Make dump_stack visible
2013-08-06 14:21:01 -07:00
dynamic debug: line queries failing due to uninitialized local variable
2013-08-28 12:10:53 -07:00
bql: Avoid possible inconsistent calculation.
2012-05-31 18:18:17 -04:00
earlycpio.c: Fix the confusing comment of find_cpio_data().
2013-08-14 23:24:01 +02:00
debugfs: add get/set for atomic types
2013-06-03 13:55:01 -07: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
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
lib: reduce the use of module.h wherever possible
2012-03-07 15:04:04 -05:00
lib/flex_proportions.c: fix corruption of denominator in flexible proportions
2012-09-25 08:59:21 -07:00
lib/gcd.c: prevent possible div by 0
2012-10-06 03:04:57 +09:00
sections: fix const sections for crc32 table
2012-10-06 03:04:46 +09:00
lib/genalloc: add a helper function for DMA buffer allocation
2013-11-13 12:09:22 +09:00
lib: reduce the use of module.h wherever possible
2012-03-07 15:04:04 -05:00
lib: introduce upper case hex ascii helpers
2013-09-20 15:38:26 -04:00
lib: reduce the use of module.h wherever possible
2012-03-07 15:04:04 -05:00
idr: print a stack dump after ida_remove warning
2013-07-03 16:08:04 -07:00
lib/int_sqrt.c: optimize square root algorithm
2013-04-29 18:28:19 -07:00
mm: interval tree updates
2012-10-09 16:22:40 +09:00
random32: rename random32 to prandom
2012-12-17 17:15:26 -08: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
The following text was taken from the original review request:
2012-03-24 10:24:31 -07:00
lib: reduce the use of module.h wherever possible
2012-03-07 15:04:04 -05:00
Hoist memcpy_fromiovec/memcpy_toiovec into lib/
2013-05-20 10:24:22 +09:30
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 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2013-11-21 19:46:00 -08:00
percpu: add test module for various percpu operations
2013-11-13 12:09:11 +09:00
treewide: Fix typo in printk
2013-06-18 13:48:45 +02:00
kfifo: kfifo_copy_{to,from}_user: fix copied bytes calculation
2013-11-15 09:32:23 +09:00
klist: del waiter from klist_remove_waiters before wakeup waitting process
2013-05-21 10:16:39 -07:00
Revert "sysfs: drop kobj_ns_type handling"
2013-11-07 20:47:28 +09:00
netlink: hide struct module parameter in netlink_kernel_create
2012-09-08 18:46:30 -04:00
kstrto*: add documentation
2012-12-17 17:15:22 -08:00
lib/kstrtox: common code between kstrto*() and simple_strto*() functions
2011-10-31 17:30:56 -07:00
lib: reduce the use of module.h wherever possible
2012-03-07 15:04:04 -05:00
rcu: Fix broken strings in RCU's source code.
2012-07-06 06:01:49 -07:00
lib/: rename random32() to prandom_u32()
2013-04-29 18:28:42 -07:00
llists-move-llist_reverse_order-from-raid5-to-llistc-fix
2013-11-15 09:32:22 +09:00
sched: Introduce preempt_count accessor functions
2013-09-25 14:07:32 +02:00
lockref: include mutex.h rather than reinvent arch_mutex_cpu_relax
2013-11-27 20:37:33 -08:00
lru_cache: introduce lc_get_cumulative()
2013-03-22 22:17:36 -06:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2013-11-22 10:52:03 -08:00
lib: reduce the use of module.h wherever possible
2012-03-07 15:04:04 -05: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
net: core: move mac_pton() to lib/net_utils.c
2013-06-05 12:00:27 -07:00
netlink: add minlen validation for the new signed types
2012-08-30 13:11:46 -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: fix up comments for valid return values from match_number
2013-02-21 17:22:25 -08:00
lib: add NO_GENERIC_PCI_IOPORT_MAP
2012-01-31 23:19:47 +02:00
percpu-refcount: Add EXPORT_SYMBOL to use percpu_ref from modules
2013-11-07 12:14:52 -08:00
percpu_counter: make APIs irq safe
2013-10-25 11:55:59 +01:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2013-11-22 10:52:03 -08:00
percpu: add test module for various percpu operations
2013-11-13 12:09:11 +09:00
lib/plist.c: make plist test announcements KERN_DEBUG
2012-10-06 03:04:58 +09:00
PM: PM notifier error injection module
2012-07-30 17:25:22 -07:00
locking, lib/proportions: Annotate prop_local_percpu::lock as raw
2011-09-13 11:11:50 +02:00
lib/radix-tree.c: make radix_tree_node_alloc() work correctly within interrupt
2013-09-11 15:59:36 -07:00
random32: use msecs_to_jiffies for reseed timer
2013-11-14 16:06:02 -05: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
rbtree: add postorder iteration functions
2013-09-11 15:59:19 -07:00
rbtree_test: add test for postorder iteration
2013-09-11 15:59:20 -07:00
sch_red: Adaptative RED AQM
2011-12-08 19:52:43 -05:00
lib/scatterlist.c: don't flush_kernel_dcache_page on slab page
2013-10-31 16:58:13 -07:00
lib: reduce the use of module.h wherever possible
2012-03-07 15:04:04 -05:00
mm: do not walk all of system memory during show_mem
2013-11-13 12:09:09 +09:00
sched: Introduce preempt_count accessor functions
2013-09-25 14:07:32 +02:00
lib: add support for stmp-style devices
2012-04-20 23:27:08 +02:00
The following text was taken from the original review request:
2012-03-24 10:24:31 -07:00
lib/string_helpers: introduce generic string_unescape
2013-04-30 17:04:03 -07:00
word-at-a-time: make the interfaces truly generic
2012-05-26 11:33:40 -07:00
lib: Fix generic strnlen_user for 32-bit big-endian machines
2012-05-27 20:59:46 -07:00
Merge remote-tracking branch 'stefano/swiotlb-xen-9.1' into stable/for-linus-3.13
2013-11-08 16:10:48 -05:00
lib: reduce the use of module.h wherever possible
2012-03-07 15:04:04 -05:00
lib/test-kstrtox.c: mark const init data with __initconst instead of __initdata
2012-05-29 16:22:32 -07:00
lib/string_helpers: introduce generic string_unescape
2013-04-30 17:04:03 -07:00
textsearch: doc - fix spelling in lib/textsearch.c.
2011-01-24 23:33:30 -08: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
vsprintf: ignore %n again
2013-11-15 09:32:20 +09:00
23fd78d764