https://github.com/torvalds/linux
Revision 2b95fda2c4fcb6d6625963f889247538f247fce0 authored by Andrey Ryabinin on 24 November 2016, 13:23:03 UTC, committed by James Morris on 25 November 2016, 01:57:48 UTC
We shouldn't free cert->pub->key in x509_cert_parse() because
x509_free_certificate() also does this:
BUG: Double free or freeing an invalid pointer
...
Call Trace:
[<ffffffff81896c20>] dump_stack+0x63/0x83
[<ffffffff81356571>] kasan_object_err+0x21/0x70
[<ffffffff81356ed9>] kasan_report_double_free+0x49/0x60
[<ffffffff813561ad>] kasan_slab_free+0x9d/0xc0
[<ffffffff81350b7a>] kfree+0x8a/0x1a0
[<ffffffff81844fbf>] public_key_free+0x1f/0x30
[<ffffffff818455d4>] x509_free_certificate+0x24/0x90
[<ffffffff818460bc>] x509_cert_parse+0x2bc/0x300
[<ffffffff81846cae>] x509_key_preparse+0x3e/0x330
[<ffffffff818444cf>] asymmetric_key_preparse+0x6f/0x100
[<ffffffff8178bec0>] key_create_or_update+0x260/0x5f0
[<ffffffff8178e6d9>] SyS_add_key+0x199/0x2a0
[<ffffffff821d823b>] entry_SYSCALL_64_fastpath+0x1e/0xad
Object at ffff880110bd1900, in cache kmalloc-512 size: 512
....
Freed:
PID = 2579
[<ffffffff8104283b>] save_stack_trace+0x1b/0x20
[<ffffffff813558f6>] save_stack+0x46/0xd0
[<ffffffff81356183>] kasan_slab_free+0x73/0xc0
[<ffffffff81350b7a>] kfree+0x8a/0x1a0
[<ffffffff818460a3>] x509_cert_parse+0x2a3/0x300
[<ffffffff81846cae>] x509_key_preparse+0x3e/0x330
[<ffffffff818444cf>] asymmetric_key_preparse+0x6f/0x100
[<ffffffff8178bec0>] key_create_or_update+0x260/0x5f0
[<ffffffff8178e6d9>] SyS_add_key+0x199/0x2a0
[<ffffffff821d823b>] entry_SYSCALL_64_fastpath+0x1e/0xad
Fixes: db6c43bd2132 ("crypto: KEYS: convert public key and digsig asym to the akcipher api")
Signed-off-by: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: James Morris <james.l.morris@oracle.com>
1 parent 16ae16c
Tip revision: 2b95fda2c4fcb6d6625963f889247538f247fce0 authored by Andrey Ryabinin on 24 November 2016, 13:23:03 UTC
X.509: Fix double free in x509_cert_parse() [ver #3]
X.509: Fix double free in x509_cert_parse() [ver #3]
Tip revision: 2b95fda
| File | Mode | Size |
|---|---|---|
| partitions | ||
| Kconfig | -rw-r--r-- | 3.8 KB |
| Kconfig.iosched | -rw-r--r-- | 1.6 KB |
| Makefile | -rw-r--r-- | 949 bytes |
| badblocks.c | -rw-r--r-- | 14.5 KB |
| bio-integrity.c | -rw-r--r-- | 14.2 KB |
| bio.c | -rw-r--r-- | 48.5 KB |
| blk-cgroup.c | -rw-r--r-- | 35.8 KB |
| blk-core.c | -rw-r--r-- | 93.3 KB |
| blk-exec.c | -rw-r--r-- | 3.2 KB |
| blk-flush.c | -rw-r--r-- | 16.3 KB |
| blk-integrity.c | -rw-r--r-- | 12.3 KB |
| blk-ioc.c | -rw-r--r-- | 10.2 KB |
| blk-lib.c | -rw-r--r-- | 7.3 KB |
| blk-map.c | -rw-r--r-- | 5.8 KB |
| blk-merge.c | -rw-r--r-- | 19.6 KB |
| blk-mq-cpumap.c | -rw-r--r-- | 2.3 KB |
| blk-mq-pci.c | -rw-r--r-- | 1.5 KB |
| blk-mq-sysfs.c | -rw-r--r-- | 11.7 KB |
| blk-mq-tag.c | -rw-r--r-- | 11.1 KB |
| blk-mq-tag.h | -rw-r--r-- | 2.2 KB |
| blk-mq.c | -rw-r--r-- | 56.5 KB |
| blk-mq.h | -rw-r--r-- | 2.7 KB |
| blk-settings.c | -rw-r--r-- | 27.0 KB |
| blk-softirq.c | -rw-r--r-- | 4.3 KB |
| blk-sysfs.c | -rw-r--r-- | 18.5 KB |
| blk-tag.c | -rw-r--r-- | 10.0 KB |
| blk-throttle.c | -rw-r--r-- | 42.7 KB |
| blk-timeout.c | -rw-r--r-- | 5.9 KB |
| blk.h | -rw-r--r-- | 9.0 KB |
| bounce.c | -rw-r--r-- | 5.8 KB |
| bsg-lib.c | -rw-r--r-- | 6.0 KB |
| bsg.c | -rw-r--r-- | 22.9 KB |
| cfq-iosched.c | -rw-r--r-- | 127.1 KB |
| cmdline-parser.c | -rw-r--r-- | 4.9 KB |
| compat_ioctl.c | -rw-r--r-- | 20.8 KB |
| deadline-iosched.c | -rw-r--r-- | 11.3 KB |
| elevator.c | -rw-r--r-- | 23.8 KB |
| genhd.c | -rw-r--r-- | 45.0 KB |
| ioctl.c | -rw-r--r-- | 14.8 KB |
| ioprio.c | -rw-r--r-- | 5.1 KB |
| noop-iosched.c | -rw-r--r-- | 2.6 KB |
| partition-generic.c | -rw-r--r-- | 14.7 KB |
| scsi_ioctl.c | -rw-r--r-- | 19.4 KB |
| t10-pi.c | -rw-r--r-- | 4.8 KB |
Computing file changes ...
