From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, stable@kernel.org
Cc: Justin Forbes <jmforbes@linuxtx.org>,
Zwane Mwaikambo <zwane@arm.linux.org.uk>,
"Theodore Ts'o" <tytso@mit.edu>,
Randy Dunlap <rdunlap@xenotime.net>,
Dave Jones <davej@redhat.com>,
Chuck Wolber <chuckw@quantumlinux.com>,
Chris Wedgwood <reviews@ml.cw.f00f.org>,
Michael Krufky <mkrufky@linuxtv.org>,
Chuck Ebbert <cebbert@redhat.com>,
Domenico Andreoli <cavokz@gmail.com>, Willy Tarreau <w@1wt.eu>,
Rodrigo Rubira Branco <rbranco@la.checkpoint.com>,
Jake Edge <jake@lwn.net>, Eugene Teo <eteo@redhat.com>,
torvalds@linux-foundation.org, akpm@linux-foundation.org,
alan@lxorguk.ukuu.org.uk, Jarod Wilson <jarod@redhat.com>,
Neil Horman <nhorman@tuxdriver.com>,
Herbert Xu <herbert@gondor.apana.org.au>
Subject: [patch 23/32] crypto: ccm - Fix handling of null assoc data
Date: Fri, 30 Jan 2009 18:40:31 -0800 [thread overview]
Message-ID: <20090131024031.GX12147@kroah.com> (raw)
In-Reply-To: <20090131023906.GA12147@kroah.com>
[-- Attachment #1: crypto-ccm-fix-handling-of-null-assoc-data.patch --]
[-- Type: text/plain, Size: 3924 bytes --]
2.6.27-stable review patch. If anyone has any objections, please let us know.
------------------
From: Jarod Wilson <jarod@redhat.com>
commit 516280e735b034216de97eb7ba080ec6acbfc58f upstream.
Its a valid use case to have null associated data in a ccm vector, but
this case isn't being handled properly right now.
The following ccm decryption/verification test vector, using the
rfc4309 implementation regularly triggers a panic, as will any
other vector with null assoc data:
* key: ab2f8a74b71cd2b1ff802e487d82f8b9
* iv: c6fb7d800d13abd8a6b2d8
* Associated Data: [NULL]
* Tag Length: 8
* input: d5e8939fc7892e2b
The resulting panic looks like so:
Unable to handle kernel paging request at ffff810064ddaec0 RIP:
[<ffffffff8864c4d7>] :ccm:get_data_to_compute+0x1a6/0x1d6
PGD 8063 PUD 0
Oops: 0002 [1] SMP
last sysfs file: /module/libata/version
CPU 0
Modules linked in: crypto_tester_kmod(U) seqiv krng ansi_cprng chainiv rng ctr aes_generic aes_x86_64 ccm cryptomgr testmgr_cipher testmgr aead crypto_blkcipher crypto_a
lgapi des ipv6 xfrm_nalgo crypto_api autofs4 hidp l2cap bluetooth nfs lockd fscache nfs_acl sunrpc ip_conntrack_netbios_ns ipt_REJECT xt_state ip_conntrack nfnetlink xt_
tcpudp iptable_filter ip_tables x_tables dm_mirror dm_log dm_multipath scsi_dh dm_mod video hwmon backlight sbs i2c_ec button battery asus_acpi acpi_memhotplug ac lp sg
snd_intel8x0 snd_ac97_codec ac97_bus snd_seq_dummy snd_seq_oss joydev snd_seq_midi_event snd_seq snd_seq_device snd_pcm_oss snd_mixer_oss ide_cd snd_pcm floppy parport_p
c shpchp e752x_edac snd_timer e1000 i2c_i801 edac_mc snd soundcore snd_page_alloc i2c_core cdrom parport serio_raw pcspkr ata_piix libata sd_mod scsi_mod ext3 jbd uhci_h
cd ohci_hcd ehci_hcd
Pid: 12844, comm: crypto-tester Tainted: G 2.6.18-128.el5.fips1 #1
RIP: 0010:[<ffffffff8864c4d7>] [<ffffffff8864c4d7>] :ccm:get_data_to_compute+0x1a6/0x1d6
RSP: 0018:ffff8100134434e8 EFLAGS: 00010246
RAX: 0000000000000000 RBX: ffff8100104898b0 RCX: ffffffffab6aea10
RDX: 0000000000000010 RSI: ffff8100104898c0 RDI: ffff810064ddaec0
RBP: 0000000000000000 R08: ffff8100104898b0 R09: 0000000000000000
R10: ffff8100103bac84 R11: ffff8100104898b0 R12: ffff810010489858
R13: ffff8100104898b0 R14: ffff8100103bac00 R15: 0000000000000000
FS: 00002ab881adfd30(0000) GS:ffffffff803ac000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b
CR2: ffff810064ddaec0 CR3: 0000000012a88000 CR4: 00000000000006e0
Process crypto-tester (pid: 12844, threadinfo ffff810013442000, task ffff81003d165860)
Stack: ffff8100103bac00 ffff8100104898e8 ffff8100134436f8 ffffffff00000000
0000000000000000 ffff8100104898b0 0000000000000000 ffff810010489858
0000000000000000 ffff8100103bac00 ffff8100134436f8 ffffffff8864c634
Call Trace:
[<ffffffff8864c634>] :ccm:crypto_ccm_auth+0x12d/0x140
[<ffffffff8864cf73>] :ccm:crypto_ccm_decrypt+0x161/0x23a
[<ffffffff88633643>] :crypto_tester_kmod:cavs_test_rfc4309_ccm+0x4a5/0x559
[...]
The above is from a RHEL5-based kernel, but upstream is susceptible too.
The fix is trivial: in crypto/ccm.c:crypto_ccm_auth(), pctx->ilen contains
whatever was in memory when pctx was allocated if assoclen is 0. The tested
fix is to simply add an else clause setting pctx->ilen to 0 for the
assoclen == 0 case, so that get_data_to_compute() doesn't try doing
things its not supposed to.
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
crypto/ccm.c | 2 ++
1 file changed, 2 insertions(+)
--- a/crypto/ccm.c
+++ b/crypto/ccm.c
@@ -266,6 +266,8 @@ static int crypto_ccm_auth(struct aead_r
if (assoclen) {
pctx->ilen = format_adata(idata, assoclen);
get_data_to_compute(cipher, pctx, req->assoc, req->assoclen);
+ } else {
+ pctx->ilen = 0;
}
/* compute plaintext into mac */
next prev parent reply other threads:[~2009-01-31 2:55 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20090131023411.032399235@mini.kroah.org>
2009-01-31 2:39 ` [patch 00/32] 2.6.27-stable review Greg KH
2009-01-31 2:39 ` [patch 01/32] fuse: destroy bdi on umount Greg KH
2009-01-31 2:39 ` [patch 02/32] fuse: fix missing fput on error Greg KH
2009-01-31 2:39 ` [patch 03/32] fuse: fix NULL deref in fuse_file_alloc() Greg KH
2009-01-31 2:39 ` [patch 04/32] inotify: clean up inotify_read and fix locking problems Greg KH
2009-01-31 2:39 ` [patch 05/32] mac80211: decrement ref count to netdev after launching mesh discovery Greg KH
2009-01-31 2:39 ` [patch 06/32] sysfs: fix problems with binary files Greg KH
2009-01-31 2:39 ` [patch 07/32] x86, mm: fix pte_free() Greg KH
2009-01-31 2:39 ` [patch 08/32] alpha: nautilus - fix compile failure with gcc-4.3 Greg KH
2009-01-31 2:39 ` [patch 09/32] it821x: Add ultra_mask quirk for Vortex86SX Greg KH
2009-01-31 2:40 ` [patch 10/32] libata: pata_via: support VX855, future chips whose IDE controller use 0x0571 Greg KH
2009-01-31 2:40 ` [patch 11/32] rtl8187: Add termination packet to prevent stall Greg KH
2009-01-31 2:40 ` [patch 12/32] serial_8250: support for Sealevel Systems Model 7803 COMM+8 Greg KH
2009-01-31 2:40 ` [patch 13/32] SUNRPC: Fix a memory leak in rpcb_getport_async Greg KH
2009-01-31 2:40 ` [patch 14/32] SUNRPC: Fix autobind on cloned rpc clients Greg KH
2009-01-31 2:40 ` [patch 15/32] USB: fix char-device disconnect handling Greg KH
2009-01-31 2:40 ` [patch 16/32] USB: storage: add unusual devs entry Greg KH
2009-01-31 2:40 ` [patch 17/32] USB: usbmon: Implement compat_ioctl Greg KH
2009-01-31 2:40 ` [patch 18/32] ALSA: hda - add another MacBook Pro 4, 1 subsystem ID Greg KH
2009-01-31 2:40 ` [patch 19/32] ALSA: hda - Add quirk for HP DV6700 laptop Greg KH
2009-01-31 2:40 ` [patch 20/32] ALSA: hda - Fix PCM reference NID for STAC/IDT analog outputs Greg KH
2009-01-31 2:40 ` [patch 21/32] bnx2x: Block nvram access when the device is inactive Greg KH
2009-01-31 2:40 ` [patch 22/32] crypto: authenc - Fix zero-length IV crash Greg KH
2009-01-31 2:40 ` Greg KH [this message]
2009-01-31 2:40 ` [patch 24/32] epoll: drop max_user_instances and rely only on max_user_watches Greg KH
2009-01-31 2:40 ` [patch 25/32] ext3: Add sanity check to make_indexed_dir Greg KH
2009-01-31 2:40 ` [patch 26/32] include/linux: Add bsg.h to the Kernel exported headers Greg KH
2009-01-31 2:40 ` [patch 27/32] sgi-xpc: ensure flags are updated before bte_copy Greg KH
2009-01-31 2:40 ` [patch 28/32] sgi-xpc: Remove NULL pointer dereference Greg KH
2009-01-31 2:40 ` [patch 29/32] sound: virtuoso: do not overwrite EEPROM on Xonar D2/D2X Greg KH
2009-01-31 2:40 ` [patch 30/32] rtl8187: Fix error in setting OFDM power settings for RTL8187L Greg KH
2009-01-31 2:40 ` [patch 31/32] PCI hotplug: fix lock imbalance in pciehp Greg KH
2009-01-31 2:40 ` [patch 32/32] relay: fix lock imbalance in relay_late_setup_files Greg KH
2009-01-31 2:57 ` For -stable: sata_mv: fix 8-port timeouts on 508x/6081 chips Mark Lord
2009-01-31 3:11 ` [stable] " Greg KH
2009-01-31 19:24 ` Jeff Garzik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090131024031.GX12147@kroah.com \
--to=gregkh@suse.de \
--cc=akpm@linux-foundation.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=cavokz@gmail.com \
--cc=cebbert@redhat.com \
--cc=chuckw@quantumlinux.com \
--cc=davej@redhat.com \
--cc=eteo@redhat.com \
--cc=herbert@gondor.apana.org.au \
--cc=jake@lwn.net \
--cc=jarod@redhat.com \
--cc=jmforbes@linuxtx.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mkrufky@linuxtv.org \
--cc=nhorman@tuxdriver.com \
--cc=rbranco@la.checkpoint.com \
--cc=rdunlap@xenotime.net \
--cc=reviews@ml.cw.f00f.org \
--cc=stable@kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=tytso@mit.edu \
--cc=w@1wt.eu \
--cc=zwane@arm.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox