From patchwork Mon Jan 26 18:04:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 432967 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 8A2151401DE for ; Tue, 27 Jan 2015 05:05:52 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756978AbbAZSFh (ORCPT ); Mon, 26 Jan 2015 13:05:37 -0500 Received: from mail-lb0-f181.google.com ([209.85.217.181]:36240 "EHLO mail-lb0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756186AbbAZSF2 (ORCPT ); Mon, 26 Jan 2015 13:05:28 -0500 Received: by mail-lb0-f181.google.com with SMTP id u10so8969524lbd.12; Mon, 26 Jan 2015 10:05:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=BAszO6DUhBwvSUBaqTP+7jxixnbhYoFAdiH0WPOsQeE=; b=B0Yd6rVbe9Ncx7fxgeDwxWm+aooWk/7ksuDOP6DubTlAUFWFHtpnliSfsRUYABCT1t pOPAn/cR76KmqL3Pk5xHKC0dCm1mlYbFaRaffgo02n17RkQFfbQnQHYFriv8pUN18fvj KVCocxuABJXIuKs3etREnaxtuPTT6pGWuFVSurHDSPqIjQ1MvsL53dFWDYNjsmvSXUko WuVZJiPuTtvBn88KqZVA3soNHceC8RLSnROO5Bwl+iXVJcKohPXrYX0cTtt8CgeySMhN 6rmvC69BSUyRUNpvdCm21Q781Lff/wdRTN4M24vqeh+vWefsOJWm4UvD21mwKRJ8Vqkh frIA== X-Received: by 10.152.8.104 with SMTP id q8mr22684228laa.56.1422295526521; Mon, 26 Jan 2015 10:05:26 -0800 (PST) Received: from xi.terra (s83-177-171-8.cust.tele2.se. [83.177.171.8]) by mx.google.com with ESMTPSA id zo3sm2976314lbb.10.2015.01.26.10.05.23 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Jan 2015 10:05:24 -0800 (PST) Received: from johan by xi.terra with local (Exim 4.84) (envelope-from ) id 1YFo2N-0001cb-20; Mon, 26 Jan 2015 19:05:23 +0100 From: Johan Hovold To: Greg Kroah-Hartman Cc: Linus Walleij , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable Subject: [PATCH 1/2] gpio: sysfs: fix gpio-chip device-attribute leak Date: Mon, 26 Jan 2015 19:04:55 +0100 Message-Id: <1422295496-6194-2-git-send-email-johan@kernel.org> X-Mailer: git-send-email 2.0.5 In-Reply-To: <1422295496-6194-1-git-send-email-johan@kernel.org> References: <1422295496-6194-1-git-send-email-johan@kernel.org> Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Commit 121b6a79955a3a3fd7bbb9b8cb88d5b9dad6283d upstream. The gpio-chip device attributes were never destroyed when the device was removed. Fix by using device_create_with_groups() to create the device attributes of the chip class device. Note that this also fixes the attribute-creation race with userspace. Fixes: d8f388d8dc8d ("gpio: sysfs interface") Cc: stable # v2.6.27+ Signed-off-by: Johan Hovold Signed-off-by: Linus Walleij Signed-off-by: Johan Hovold --- drivers/gpio/gpiolib.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 0dee0e0c247a..dd4d6ffacc30 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -627,16 +627,13 @@ static ssize_t chip_ngpio_show(struct device *dev, } static DEVICE_ATTR(ngpio, 0444, chip_ngpio_show, NULL); -static const struct attribute *gpiochip_attrs[] = { +static struct attribute *gpiochip_attrs[] = { &dev_attr_base.attr, &dev_attr_label.attr, &dev_attr_ngpio.attr, NULL, }; - -static const struct attribute_group gpiochip_attr_group = { - .attrs = (struct attribute **) gpiochip_attrs, -}; +ATTRIBUTE_GROUPS(gpiochip); /* * /sys/class/gpio/export ... write-only @@ -1001,13 +998,13 @@ static int gpiochip_export(struct gpio_chip *chip) /* use chip->base for the ID; it's already known to be unique */ mutex_lock(&sysfs_lock); - dev = device_create(&gpio_class, chip->dev, MKDEV(0, 0), chip, - "gpiochip%d", chip->base); - if (!IS_ERR(dev)) { - status = sysfs_create_group(&dev->kobj, - &gpiochip_attr_group); - } else + dev = device_create_with_groups(&gpio_class, chip->dev, MKDEV(0, 0), + chip, gpiochip_groups, + "gpiochip%d", chip->base); + if (IS_ERR(dev)) status = PTR_ERR(dev); + else + status = 0; chip->exported = (status == 0); mutex_unlock(&sysfs_lock);