summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@kernel.crashing.org>2003-10-08 00:27:26 -0700
committerPaul Mackerras <paulus@samba.org>2003-10-08 00:27:26 -0700
commit0031ac2007b30c9bbbd739fb01d864b6880bd49a (patch)
tree4c73208989d50fc702cb410e90ca01c37b489151
parent413c4569ba0383c9aa7c98d0e82f1cd7dc5776c1 (diff)
PPC: Change how we export some Openfirmware device nodes.
From Ethan Benson <erbenson@alaska.net>.
-rw-r--r--fs/proc/proc_devtree.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/fs/proc/proc_devtree.c b/fs/proc/proc_devtree.c
index 18917b6591df..bc62cac8ce3a 100644
--- a/fs/proc/proc_devtree.c
+++ b/fs/proc/proc_devtree.c
@@ -59,11 +59,14 @@ static void add_node(struct device_node *np, struct proc_dir_entry *de)
* Unfortunately proc_register puts each new entry
* at the beginning of the list. So we rearrange them.
*/
- ent = create_proc_read_entry(pp->name, S_IRUGO, de,
- property_read_proc, pp);
+ ent = create_proc_read_entry(pp->name, strncmp(pp->name, "security-", 9) ?
+ S_IRUGO : S_IRUSR, de, property_read_proc, pp);
if (ent == 0)
break;
- ent->size = pp->length;
+ if (!strncmp(pp->name, "security-", 9))
+ ent->size = 0; /* don't leak number of password chars */
+ else
+ ent->size = pp->length;
*lastp = ent;
lastp = &ent->next;
}