Return-path: Received: from mx39.mail.ru ([94.100.176.53]:64692 "EHLO mx39.mail.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750935AbZLVSi4 (ORCPT ); Tue, 22 Dec 2009 13:38:56 -0500 From: Andrey Borzenkov To: Dave Subject: Re: [PATCH v2] 2.6.33: orinoco: fix GFP_KERNEL in orinoco_set_key with interrupts disabled Date: Tue, 22 Dec 2009 21:38:44 +0300 Cc: orinoco-devel@lists.sourceforge.net, linux-wireless@vger.kernel.org, stable@kernel.org References: <200912101955.01325.arvidjaar@mail.ru> <200912102156.32029.arvidjaar@mail.ru> <4B26435F.5020002@gmail.com> In-Reply-To: <4B26435F.5020002@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart1774596.UUH7hSPU4e"; protocol="application/pgp-signature"; micalg=pgp-sha1 Message-Id: <200912222138.50257.arvidjaar@mail.ru> Sender: linux-wireless-owner@vger.kernel.org List-ID: --nextPart1774596.UUH7hSPU4e Content-Type: multipart/mixed; boundary="Boundary-01=_1IRML0WLRXUDkL2" Content-Transfer-Encoding: 7bit --Boundary-01=_1IRML0WLRXUDkL2 Content-Type: Text/Plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Monday 14 of December 2009 16:53:35 Dave wrote: > If I understand it right, we want to cc the patch to > stable@kernel.org. So if you could take care of that comment and > resubmit with cc (and something in the title so John can tell we'd > like this in 2.6.33 as well), everyone's happy >=20 New version attached. --Boundary-01=_1IRML0WLRXUDkL2 Content-Type: message/rfc822; name="orinoco_set_key-atomic" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="orinoco_set_key-atomic" Subject: [PATCH] 2.6.33: orinoco: fix GFP_KERNEL in orinoco_set_key with interrupts disabled From: Andrey Borzenkov orinoco_set_key is called from two places both with interrupts disabled (under orinoco_lock). Use GFP_ATOMIC instead of GFP_KERNEL. Fixes following warning: [ 77.254109] WARNING: at /home/bor/src/linux-git/kernel/lockdep.c:2465 lockdep_trace_alloc+0x9a/0xa0() [ 77.254109] Hardware name: PORTEGE 4000 [ 77.254109] Modules linked in: af_packet irnet ppp_generic slhc ircomm_tty ircomm binfmt_misc dm_mirror dm_region_hash dm_log dm_round_robin dm_multipath dm_mod loop nvram toshiba cryptomgr aead pcompress crypto_blkcipher michael_mic crypto_hash crypto_algapi orinoco_cs orinoco cfg80211 smsc_ircc2 pcmcia irda toshiba_acpi yenta_socket video i2c_ali1535 backlight rsrc_nonstatic ali_agp pcmcia_core psmouse output crc_ccitt i2c_core alim1535_wdt rfkill sg evdev ohci_hcd agpgart usbcore pata_ali libata reiserfs [last unloaded: scsi_wait_scan] [ 77.254109] Pid: 2296, comm: wpa_supplicant Not tainted 2.6.32-1avb #1 [ 77.254109] Call Trace: [ 77.254109] [] warn_slowpath_common+0x6d/0xa0 [ 77.254109] [] ? lockdep_trace_alloc+0x9a/0xa0 [ 77.254109] [] ? lockdep_trace_alloc+0x9a/0xa0 [ 77.254109] [] warn_slowpath_null+0x15/0x20 [ 77.254109] [] lockdep_trace_alloc+0x9a/0xa0 [ 77.254109] [] __kmalloc+0x36/0x130 [ 77.254109] [] ? orinoco_set_key+0x48/0x1c0 [orinoco] [ 77.254109] [] orinoco_set_key+0x48/0x1c0 [orinoco] [ 77.254109] [] orinoco_ioctl_set_encodeext+0x1dc/0x2d0 [orinoco] [ 77.254109] [] ioctl_standard_call+0x207/0x3b0 [ 77.254109] [] ? orinoco_ioctl_set_encodeext+0x0/0x2d0 [orinoco] [ 77.254109] [] ? rtnl_lock+0xf/0x20 [ 77.254109] [] ? rtnl_lock+0xf/0x20 [ 77.254109] [] ? __dev_get_by_name+0x85/0xb0 [ 77.254109] [] wext_handle_ioctl+0x176/0x200 [ 77.254109] [] ? orinoco_ioctl_set_encodeext+0x0/0x2d0 [orinoco] [ 77.254109] [] dev_ioctl+0x6af/0x730 [ 77.254109] [] ? move_addr_to_kernel+0x55/0x60 [ 77.254109] [] ? sys_sendto+0xe9/0x130 [ 77.254109] [] sock_ioctl+0x7e/0x250 [ 77.254109] [] ? sock_ioctl+0x0/0x250 [ 77.254109] [] vfs_ioctl+0x1c/0x70 [ 77.254109] [] do_vfs_ioctl+0x6a/0x590 [ 77.254109] [] ? might_fault+0x90/0xa0 [ 77.254109] [] ? might_fault+0x4a/0xa0 [ 77.254109] [] ? sys_socketcall+0x17e/0x280 [ 77.254109] [] sys_ioctl+0x39/0x60 [ 77.254109] [] sysenter_do_call+0x12/0x32 [ 77.254109] ---[ end trace 95ef563548d21efd ]--- Signed-off-by: Andrey Borzenkov --- drivers/net/wireless/orinoco/wext.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/orinoco/wext.c b/drivers/net/wireless/orinoco/wext.c index 7698fdd..31ca241 100644 --- a/drivers/net/wireless/orinoco/wext.c +++ b/drivers/net/wireless/orinoco/wext.c @@ -23,7 +23,7 @@ #define MAX_RID_LEN 1024 /* Helper routine to record keys - * Do not call from interrupt context */ + * It is called under orinoco_lock so it may not sleep */ static int orinoco_set_key(struct orinoco_private *priv, int index, enum orinoco_alg alg, const u8 *key, int key_len, const u8 *seq, int seq_len) @@ -32,14 +32,14 @@ static int orinoco_set_key(struct orinoco_private *priv, int index, kzfree(priv->keys[index].seq); if (key_len) { - priv->keys[index].key = kzalloc(key_len, GFP_KERNEL); + priv->keys[index].key = kzalloc(key_len, GFP_ATOMIC); if (!priv->keys[index].key) goto nomem; } else priv->keys[index].key = NULL; if (seq_len) { - priv->keys[index].seq = kzalloc(seq_len, GFP_KERNEL); + priv->keys[index].seq = kzalloc(seq_len, GFP_ATOMIC); if (!priv->keys[index].seq) goto free_key; } else --Boundary-01=_1IRML0WLRXUDkL2-- --nextPart1774596.UUH7hSPU4e Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iEYEABECAAYFAksxEjUACgkQR6LMutpd94xkkgCgyy7+JB7X2OrBXhOcO8ypSYOF xisAn34CAm+IpGAQrUo6E9ERGR3hyDlu =1UoG -----END PGP SIGNATURE----- --nextPart1774596.UUH7hSPU4e--