userspace program

misc0110 · misc0110 · commit 2bb36233e085 · 2017-02-07T23:05:47.000+01:00
diff --git a/module/procdetails.c b/module/procdetails.c
@@ -46,7 +46,7 @@ static int proc_procreadwrite_show (struct seq_file *m, void *v) {
     size_t spacing;
     char spacing_left[] = "                                                   ";
 
-    if(!proc_details.filename[0]) {
+    if(!proc_details.filename[0] || !proc_details.dir_entry) {
         return -ENOENT;
     }
     
@@ -60,12 +60,13 @@ static int proc_procreadwrite_show (struct seq_file *m, void *v) {
         "\n------------------------------------------------------------\n", spacing_left, proc_details.filename);
     
     snprintf(buf, BUF, "%s> %-42s : %s\n", buf, "Module ", proc_details.modname); 
-    snprintf(buf, BUF, "%s> %-42s\n", buf, "Mode "); 
-    snprintf(buf, BUF, "%s      %-38s : %o\n", buf, "Format ", (proc_details.dir_entry->mode & 0170000) / (8 * 8 * 8));
-    snprintf(buf, BUF, "%s      %-38s : %o\n", buf, "Permissions ", proc_details.dir_entry->mode & 0777);
-    snprintf(buf, BUF, "%s> %-42s : %zd\n", buf, "Count ", (size_t)(proc_details.dir_entry->count.counter)); 
-    snprintf(buf, BUF, "%s> %-42s : %zd\n", buf, "In use ", (size_t)(proc_details.dir_entry->in_use.counter)); 
-    
+    if(proc_details.dir_entry) {
+        snprintf(buf, BUF, "%s> %-42s\n", buf, "Mode "); 
+        snprintf(buf, BUF, "%s      %-38s : %o\n", buf, "Format ", (proc_details.dir_entry->mode & 0170000) / (8 * 8 * 8));
+        snprintf(buf, BUF, "%s      %-38s : %o\n", buf, "Permissions ", proc_details.dir_entry->mode & 0777);
+        snprintf(buf, BUF, "%s> %-42s : %zd\n", buf, "Count ", (size_t)(proc_details.dir_entry->count.counter)); 
+        snprintf(buf, BUF, "%s> %-42s : %zd\n", buf, "In use ", (size_t)(proc_details.dir_entry->in_use.counter)); 
+    }
     snprintf(buf, BUF, "%s> %-42s : %s\n", buf, "File Operations ", proc_details.fops[0] ? "Yes" : "No");
     if(proc_details.fops[0]) {
         snprintf(buf, BUF, "%s    %s = {\n", buf, proc_details.fops);
@@ -78,6 +79,7 @@ static int proc_procreadwrite_show (struct seq_file *m, void *v) {
     }
     
     seq_puts(m, buf);
+    proc_details.filename[0] = 0;
     return 0;
 }
 
@@ -136,6 +138,7 @@ static void get_details() {
     char *modname = NULL;
     char namebuf[128];
     
+    proc_details.dir_entry = NULL;
     spin_lock(subdir_lock);
     rv = xlate(proc_details.filename, &(proc_details.dir_entry), &fn);
     printk(KERN_INFO MOD "Ret: %d, Residual: %s\n", rv, fn);
diff --git a/userspace/Makefile b/userspace/Makefile
@@ -0,0 +1,3 @@
+all: procinfo.c
+	gcc procinfo.c -o procinfo -Wall -Wextra
+	
diff --git a/userspace/procinfo.c b/userspace/procinfo.c
@@ -0,0 +1,48 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+int main(int argc, char* argv[]) {
+    char proc[256];
+    char *line = NULL, *module = NULL;
+    size_t len = 0, total = 0;
+    ssize_t read;
+
+    if(argc != 2) {
+        printf("Usage: %s <proc filename>\n", argv[0]);
+        return -1;
+    }
+    
+    proc[255] = 0;
+    if((module = strrchr(argv[1], '/')) != NULL) {
+        strncpy(proc, module + 1, 255);
+    } else {
+        strncpy(proc, argv[1], 255);
+    }
+
+    FILE* f = fopen("/proc/procdetails", "w");
+    if(!f) {
+        fprintf(stderr, "Could not find /proc/procdetails! Did you load the procdetails kernel module?\n");
+        return -1;
+    }
+    fputs(proc, f);
+    fclose(f);
+    f = fopen("/proc/procdetails", "r");
+    if(!f) {
+        fprintf(stderr, "Something strange happened...\n");
+        return -1;
+    }
+
+    while ((read = getline(&line, &len, f)) != -1) {
+        total += len;
+        printf("%s", line);
+    }
+    free(line);
+    fclose(f);
+
+    if(!total) {
+        printf("Did not find any information\n");
+        return -1;
+    }
+    return 0;
+}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+all: procinfo.c`
	`2`	`+ gcc procinfo.c -o procinfo -Wall -Wextra`
	`3`	`+`