Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759338AbXK2EAq (ORCPT ); Wed, 28 Nov 2007 23:00:46 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756401AbXK2EAi (ORCPT ); Wed, 28 Nov 2007 23:00:38 -0500 Received: from rtr.ca ([76.10.145.34]:1711 "EHLO mail.rtr.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756321AbXK2EAi (ORCPT ); Wed, 28 Nov 2007 23:00:38 -0500 Message-ID: <474E3964.7040200@rtr.ca> Date: Wed, 28 Nov 2007 23:00:36 -0500 From: Mark Lord User-Agent: Thunderbird 2.0.0.9 (X11/20071031) MIME-Version: 1.0 To: Linux Kernel , Greg KH , Andrew Morton Subject: [PATCH] base/class.c: prevent ooops due to insert/remove race Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1039 Lines: 31 While doing insert/remove (quickly) tests on USB, I managed to trigger an Oops on 2.6.23.1 on the call to strlen() in make_class_name(). This patch prevents this oops. There is still the larger problem of the overall race that caused this in the first place, but much of the rest of the code in class.c appears to also do NULL checks to avoid Oops'ing, so this continues the tradition. Signed-off-by: Mark Lord --- Patch applies to both 2.6.24 and 2.6.23. --- old/drivers/base/class.c 2007-11-28 22:54:59.000000000 -0500 +++ linux/drivers/base/class.c 2007-11-28 22:54:48.000000000 -0500 @@ -354,6 +354,8 @@ char *class_name; int size; + if (!name) + return NULL; size = strlen(name) + strlen(kobject_name(kobj)) + 2; class_name = kmalloc(size, GFP_KERNEL); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/