Commit e8393179 authored by Tycho Andersen's avatar Tycho Andersen Committed by Kees Cook

seccomp: don't leave dangling ->notif if file allocation fails

Christian and Kees both pointed out that this is a bit sloppy to open-code
both places, and Christian points out that we leave a dangling pointer to
->notif if file allocation fails. Since we check ->notif for null in order
to determine if it's ok to install a filter, this means people won't be
able to install a filter if the file allocation fails for some reason, even
if they subsequently should be able to.

To fix this, let's hoist this free+null into its own little helper and use
it.
Reported-by: default avatarKees Cook <keescook@chromium.org>
Reported-by: default avatarChristian Brauner <christian.brauner@ubuntu.com>
Signed-off-by: default avatarTycho Andersen <tycho@tycho.pizza>
Acked-by: default avatarChristian Brauner <christian.brauner@ubuntu.com>
Link: https://lore.kernel.org/r/20200902140953.1201956-1-tycho@tycho.pizzaSigned-off-by: default avatarKees Cook <keescook@chromium.org>
parent 19d1d49f
...@@ -1109,6 +1109,12 @@ static long seccomp_set_mode_strict(void) ...@@ -1109,6 +1109,12 @@ static long seccomp_set_mode_strict(void)
} }
#ifdef CONFIG_SECCOMP_FILTER #ifdef CONFIG_SECCOMP_FILTER
static void seccomp_notify_free(struct seccomp_filter *filter)
{
kfree(filter->notif);
filter->notif = NULL;
}
static void seccomp_notify_detach(struct seccomp_filter *filter) static void seccomp_notify_detach(struct seccomp_filter *filter)
{ {
struct seccomp_knotif *knotif; struct seccomp_knotif *knotif;
...@@ -1138,8 +1144,7 @@ static void seccomp_notify_detach(struct seccomp_filter *filter) ...@@ -1138,8 +1144,7 @@ static void seccomp_notify_detach(struct seccomp_filter *filter)
complete(&knotif->ready); complete(&knotif->ready);
} }
kfree(filter->notif); seccomp_notify_free(filter);
filter->notif = NULL;
mutex_unlock(&filter->notify_lock); mutex_unlock(&filter->notify_lock);
} }
...@@ -1494,7 +1499,7 @@ static struct file *init_listener(struct seccomp_filter *filter) ...@@ -1494,7 +1499,7 @@ static struct file *init_listener(struct seccomp_filter *filter)
out_notif: out_notif:
if (IS_ERR(ret)) if (IS_ERR(ret))
kfree(filter->notif); seccomp_notify_free(filter);
out: out:
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment