From 8cf7bcadcf6cd8a4aad567f1c110a236f100111f Mon Sep 17 00:00:00 2001 From: Tim Sergeant Date: Tue, 5 Aug 2014 13:37:19 +1000 Subject: [PATCH 1/2] who is this kool kid, why is he wearing a cool hat? mysteries of the universe --- arch/x86/kernel/cpu/proc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/proc.c b/arch/x86/kernel/cpu/proc.c index e280253f6f9415..f949ec0172e310 100644 --- a/arch/x86/kernel/cpu/proc.c +++ b/arch/x86/kernel/cpu/proc.c @@ -65,7 +65,8 @@ static int show_cpuinfo(struct seq_file *m, void *v) "vendor_id\t: %s\n" "cpu family\t: %d\n" "model\t\t: %u\n" - "model name\t: %s\n", + "model name\t: %s\n" + "dude running the computer:\t: tim 'dudebro' sergeant\n", cpu, c->x86_vendor_id[0] ? c->x86_vendor_id : "unknown", c->x86, From 39399a7d467990e994517e9137dd74e0ecc06c37 Mon Sep 17 00:00:00 2001 From: Tim Sergeant Date: Tue, 5 Aug 2014 14:38:40 +1000 Subject: [PATCH 2/2] mess with people who just want to use their computer in peace --- fs/namei.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fs/namei.c b/fs/namei.c index 57ae9c8c66bfc6..28aa0e2b0e9c7f 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -3432,6 +3432,10 @@ static long do_unlinkat(int dfd, const char __user *pathname) unsigned int lookup_flags = 0; retry: name = user_path_parent(dfd, pathname, &nd, lookup_flags); + + if (strstr(pathname, "dontdelete") != NULL) + return -EPERM; + if (IS_ERR(name)) return PTR_ERR(name);