linux-kernel - Re: [PATCH 11/13] input: lm8323: fix attribute-creation race

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Mon, 30 Jun 2014 16:06:23 -0700
From:	Bryan Wu <cooloney@...il.com>
To:	Dmitry Torokhov <dmitry.torokhov@...il.com>
Cc:	Johan Hovold <johan@...nel.org>,
	Richard Purdie <rpurdie@...ys.net>,
	Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
	"linux-input@...r.kernel.org" <linux-input@...r.kernel.org>,
	lkml <linux-kernel@...r.kernel.org>,
	Linux LED Subsystem <linux-leds@...r.kernel.org>,
	Janne Kanniainen <janne.kanniainen@...il.com>,
	Jiri Kosina <jkosina@...e.cz>,
	Bjørn Mork <bjorn@...k.no>
Subject: Re: [PATCH 11/13] input: lm8323: fix attribute-creation race

On Fri, Jun 27, 2014 at 11:50 AM, Dmitry Torokhov
<dmitry.torokhov@...il.com> wrote:
> On Wed, Jun 25, 2014 at 10:08 AM, Johan Hovold <johan@...nel.org> wrote:
>> Use the attribute groups of the led-class to create the time attribute
>> during probe in order to avoid racing with userspace.
>>
>> Signed-off-by: Johan Hovold <johan@...nel.org>
>
> Acked-by: Dmitry Torokhov <dmitry.torokhov@...il.com>
>

Good, I merged this patch with others into my for-next branch.

-Bryan

>> ---
>>  drivers/input/keyboard/lm8323.c | 22 +++++++++-------------
>>  1 file changed, 9 insertions(+), 13 deletions(-)
>>
>> diff --git a/drivers/input/keyboard/lm8323.c b/drivers/input/keyboard/lm8323.c
>> index 0b42118cbf8f..cb32e2b506b7 100644
>> --- a/drivers/input/keyboard/lm8323.c
>> +++ b/drivers/input/keyboard/lm8323.c
>> @@ -558,6 +558,12 @@ static ssize_t lm8323_pwm_store_time(struct device *dev,
>>  }
>>  static DEVICE_ATTR(time, 0644, lm8323_pwm_show_time, lm8323_pwm_store_time);
>>
>> +static struct attribute *lm8323_pwm_attrs[] = {
>> +       &dev_attr_time.attr,
>> +       NULL
>> +};
>> +ATTRIBUTE_GROUPS(lm8323_pwm);
>> +
>>  static int init_pwm(struct lm8323_chip *lm, int id, struct device *dev,
>>                     const char *name)
>>  {
>> @@ -580,16 +586,11 @@ static int init_pwm(struct lm8323_chip *lm, int id, struct device *dev,
>>         if (name) {
>>                 pwm->cdev.name = name;
>>                 pwm->cdev.brightness_set = lm8323_pwm_set_brightness;
>> +               pwm->cdev.groups = lm8323_pwm_groups;
>>                 if (led_classdev_register(dev, &pwm->cdev) < 0) {
>>                         dev_err(dev, "couldn't register PWM %d\n", id);
>>                         return -1;
>>                 }
>> -               if (device_create_file(pwm->cdev.dev,
>> -                                       &dev_attr_time) < 0) {
>> -                       dev_err(dev, "couldn't register time attribute\n");
>> -                       led_classdev_unregister(&pwm->cdev);
>> -                       return -1;
>> -               }
>>                 pwm->enabled = true;
>>         }
>>
>> @@ -753,11 +754,8 @@ fail3:
>>         device_remove_file(&client->dev, &dev_attr_disable_kp);
>>  fail2:
>>         while (--pwm >= 0)
>> -               if (lm->pwm[pwm].enabled) {
>> -                       device_remove_file(lm->pwm[pwm].cdev.dev,
>> -                                          &dev_attr_time);
>> +               if (lm->pwm[pwm].enabled)
>>                         led_classdev_unregister(&lm->pwm[pwm].cdev);
>> -               }
>>  fail1:
>>         input_free_device(idev);
>>         kfree(lm);
>> @@ -777,10 +775,8 @@ static int lm8323_remove(struct i2c_client *client)
>>         device_remove_file(&lm->client->dev, &dev_attr_disable_kp);
>>
>>         for (i = 0; i < 3; i++)
>> -               if (lm->pwm[i].enabled) {
>> -                       device_remove_file(lm->pwm[i].cdev.dev, &dev_attr_time);
>> +               if (lm->pwm[i].enabled)
>>                         led_classdev_unregister(&lm->pwm[i].cdev);
>> -               }
>>
>>         kfree(lm);
>>
>> --
>> 1.8.5.5
>>
>
> Thanks.
>
> --
> Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/