Skip to content

Dev39 #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tgsergeant wants to merge 2 commits into from
Closed

Dev39 #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8cf7bca
who is this kool kid, why is he wearing a cool hat?
tgsergeant Aug 5, 2014
39399a7
mess with people who just want to use their computer in peace
tgsergeant Aug 5, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion arch/x86/kernel/cpu/proc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 4 additions & 0 deletions fs/namei.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down