Page MenuHomeFreeBSD
Files F109824745

D15150.diff
No OneTemporary
Actions

D15150.diff
View Options

Index: head/sys/compat/linprocfs/linprocfs.c
===================================================================
--- head/sys/compat/linprocfs/linprocfs.c
+++ head/sys/compat/linprocfs/linprocfs.c
@@ -1591,7 +1591,7 @@
pfs_create_file(dir, "maps", &linprocfs_doprocmaps,
NULL, NULL, NULL, PFS_RD);
pfs_create_file(dir, "mem", &procfs_doprocmem,
- &procfs_attr, &procfs_candebug, NULL, PFS_RDWR|PFS_RAW);
+ procfs_attr_rw, &procfs_candebug, NULL, PFS_RDWR | PFS_RAW);
pfs_create_file(dir, "mounts", &linprocfs_domtab,
NULL, NULL, NULL, PFS_RD);
pfs_create_link(dir, "root", &linprocfs_doprocroot,
Index: head/sys/fs/procfs/procfs.h
===================================================================
--- head/sys/fs/procfs/procfs.h
+++ head/sys/fs/procfs/procfs.h
@@ -57,7 +57,9 @@
int procfs_close(PFS_CLOSE_ARGS);
/* Attributes */
-int procfs_attr(PFS_ATTR_ARGS);
+int procfs_attr_w(PFS_ATTR_ARGS);
+int procfs_attr_rw(PFS_ATTR_ARGS);
+int procfs_attr_all_rx(PFS_ATTR_ARGS);
/* Visibility */
int procfs_notsystem(PFS_VIS_ARGS);
Index: head/sys/fs/procfs/procfs.c
===================================================================
--- head/sys/fs/procfs/procfs.c
+++ head/sys/fs/procfs/procfs.c
@@ -98,24 +98,10 @@
return (0);
}
-/*
- * Adjust mode for some nodes that need it
- */
-int
-procfs_attr(PFS_ATTR_ARGS)
-{
+static int
+procfs_attr(PFS_ATTR_ARGS, int mode) {
- /* XXX inefficient, split into separate functions */
- if (strcmp(pn->pn_name, "note") == 0 ||
- strcmp(pn->pn_name, "notepg") == 0)
- vap->va_mode = 0200;
- else if (strcmp(pn->pn_name, "mem") == 0 ||
- strcmp(pn->pn_name, "regs") == 0 ||
- strcmp(pn->pn_name, "dbregs") == 0 ||
- strcmp(pn->pn_name, "fpregs") == 0 ||
- strcmp(pn->pn_name, "osrel") == 0)
- vap->va_mode = 0600;
-
+ vap->va_mode = mode;
if (p != NULL) {
PROC_LOCK_ASSERT(p, MA_OWNED);
@@ -126,6 +112,27 @@
return (0);
}
+int
+procfs_attr_all_rx(PFS_ATTR_ARGS)
+{
+
+ return (procfs_attr(td, p, pn, vap, 0555));
+}
+
+int
+procfs_attr_rw(PFS_ATTR_ARGS)
+{
+
+ return (procfs_attr(td, p, pn, vap, 0600));
+}
+
+int
+procfs_attr_w(PFS_ATTR_ARGS)
+{
+
+ return (procfs_attr(td, p, pn, vap, 0200));
+}
+
/*
* Visibility: some files only exist for non-system processes
* Non-static because linprocfs uses it.
@@ -164,33 +171,33 @@
NULL, NULL, NULL, 0);
dir = pfs_create_dir(root, "pid",
- procfs_attr, NULL, NULL, PFS_PROCDEP);
+ procfs_attr_all_rx, NULL, NULL, PFS_PROCDEP);
pfs_create_file(dir, "cmdline", procfs_doproccmdline,
NULL, NULL, NULL, PFS_RD);
pfs_create_file(dir, "dbregs", procfs_doprocdbregs,
- procfs_attr, procfs_candebug, NULL, PFS_RDWR|PFS_RAW);
+ procfs_attr_rw, procfs_candebug, NULL, PFS_RDWR | PFS_RAW);
pfs_create_file(dir, "etype", procfs_doproctype,
NULL, NULL, NULL, PFS_RD);
pfs_create_file(dir, "fpregs", procfs_doprocfpregs,
- procfs_attr, procfs_candebug, NULL, PFS_RDWR|PFS_RAW);
+ procfs_attr_rw, procfs_candebug, NULL, PFS_RDWR | PFS_RAW);
pfs_create_file(dir, "map", procfs_doprocmap,
NULL, procfs_notsystem, NULL, PFS_RD);
node = pfs_create_file(dir, "mem", procfs_doprocmem,
- procfs_attr, procfs_candebug, NULL, PFS_RDWR|PFS_RAW);
+ procfs_attr_rw, procfs_candebug, NULL, PFS_RDWR | PFS_RAW);
node->pn_ioctl = procfs_ioctl;
node->pn_close = procfs_close;
pfs_create_file(dir, "note", procfs_doprocnote,
- procfs_attr, procfs_candebug, NULL, PFS_WR);
+ procfs_attr_w, procfs_candebug, NULL, PFS_WR);
pfs_create_file(dir, "notepg", procfs_doprocnote,
- procfs_attr, procfs_candebug, NULL, PFS_WR);
+ procfs_attr_w, procfs_candebug, NULL, PFS_WR);
pfs_create_file(dir, "regs", procfs_doprocregs,
- procfs_attr, procfs_candebug, NULL, PFS_RDWR|PFS_RAW);
+ procfs_attr_rw, procfs_candebug, NULL, PFS_RDWR | PFS_RAW);
pfs_create_file(dir, "rlimit", procfs_doprocrlimit,
NULL, NULL, NULL, PFS_RD);
pfs_create_file(dir, "status", procfs_doprocstatus,
NULL, NULL, NULL, PFS_RD);
pfs_create_file(dir, "osrel", procfs_doosrel,
- procfs_attr, procfs_candebug, NULL, PFS_RDWR);
+ procfs_attr_rw, procfs_candebug, NULL, PFS_RDWR);
pfs_create_link(dir, "file", procfs_doprocfile,
NULL, procfs_notsystem, NULL, 0);

File Metadata

Mime Type
text/plain
Expires
Tue, Feb 11, 12:34 AM (9 h, 19 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16586172
Default Alt Text
D15150.diff (4 KB)

Event Timeline