Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12aa4c64 authored by Brian Swetland's avatar Brian Swetland Committed by Linus Torvalds
Browse files

w1: don't allow arbitrary users to remove w1 devices 



The search/pullup/add/remove device attributes were 0666 which would allow
arbitrary users to affect the 1 wire bus.  Change to 0664 to prevent that.

I found this patch in the Android tree, apparently this has never been
sent upstream so doing it now.

Signed-off-by: default avatarBrian Swetland <swetland@google.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@stericsson.com>
Cc: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f49d2eb3

drivers/w1/w1.c

+4 −4
Original line number Diff line number Diff line
@@ -517,10 +517,10 @@ static W1_MASTER_ATTR_RO(max_slave_count, S_IRUGO); 
static W1_MASTER_ATTR_RO(attempts, S_IRUGO);

static W1_MASTER_ATTR_RO(timeout, S_IRUGO);

static W1_MASTER_ATTR_RO(pointer, S_IRUGO);

static W1_MASTER_ATTR_RW(search, S_IRUGO | S_IWUGO);

static W1_MASTER_ATTR_RW(pullup, S_IRUGO | S_IWUGO);

static W1_MASTER_ATTR_RW(add, S_IRUGO | S_IWUGO);

static W1_MASTER_ATTR_RW(remove, S_IRUGO | S_IWUGO);

static W1_MASTER_ATTR_RW(search, S_IRUGO | S_IWUSR | S_IWGRP);

static W1_MASTER_ATTR_RW(pullup, S_IRUGO | S_IWUSR | S_IWGRP);

static W1_MASTER_ATTR_RW(add, S_IRUGO | S_IWUSR | S_IWGRP);

static W1_MASTER_ATTR_RW(remove, S_IRUGO | S_IWUSR | S_IWGRP);



static struct attribute *w1_master_default_attrs[] = {

	&w1_master_attribute_name.attr,