| Message ID | 20210307113031.11671-4-john.wood@gmx.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Fork brute force attack mitigation | expand |
On Sun, Mar 07, 2021 at 12:30:26PM +0100, John Wood wrote: > To detect a brute force attack it is necessary that the statistics > shared by all the fork hierarchy processes be updated in every fatal > crash and the most important data to update is the application crash > period. To do so, use the new "task_fatal_signal" LSM hook added in a > previous step. > > The application crash period must be a value that is not prone to change > due to spurious data and follows the real crash period. So, to compute > it, the exponential moving average (EMA) is used. > > There are two types of brute force attacks that need to be detected. The > first one is an attack that happens through the fork system call and the > second one is an attack that happens through the execve system call. The > first type uses the statistics shared by all the fork hierarchy > processes, but the second type cannot use this statistical data due to > these statistics disappear when the involved tasks finished. In this > last scenario the attack info should be tracked by the statistics of a > higher fork hierarchy (the hierarchy that contains the process that > forks before the execve system call). > > Moreover, these two attack types have two variants. A slow brute force > attack that is detected if the maximum number of faults per fork > hierarchy is reached and a fast brute force attack that is detected if > the application crash period falls below a certain threshold. > > Also, this patch adds locking to protect the statistics pointer hold by > every process. > > Signed-off-by: John Wood <john.wood@gmx.com> > --- > security/brute/brute.c | 498 +++++++++++++++++++++++++++++++++++++++-- > 1 file changed, 479 insertions(+), 19 deletions(-) > > diff --git a/security/brute/brute.c b/security/brute/brute.c > index 99d099e45112..870db55332d4 100644 > --- a/security/brute/brute.c > +++ b/security/brute/brute.c > @@ -11,9 +11,14 @@ > #include <linux/jiffies.h> > #include <linux/kernel.h> > #include <linux/lsm_hooks.h> > +#include <linux/math64.h> > #include <linux/printk.h> > #include <linux/refcount.h> > +#include <linux/rwlock.h> > +#include <linux/rwlock_types.h> > #include <linux/sched.h> > +#include <linux/sched/signal.h> > +#include <linux/sched/task.h> > #include <linux/slab.h> > #include <linux/spinlock.h> > #include <linux/types.h> > @@ -37,6 +42,11 @@ struct brute_stats { > u64 period; > }; > > +/* > + * brute_stats_ptr_lock - Lock to protect the brute_stats structure pointer. > + */ > +static DEFINE_RWLOCK(brute_stats_ptr_lock); Yeow, you've switched from an (unneeded in prior patch) per-stats lock to a global lock? I think this isn't needed... > + > /* > * brute_blob_sizes - LSM blob sizes. > * > @@ -74,7 +84,7 @@ static struct brute_stats *brute_new_stats(void) > { > struct brute_stats *stats; > > - stats = kmalloc(sizeof(struct brute_stats), GFP_KERNEL); > + stats = kmalloc(sizeof(struct brute_stats), GFP_ATOMIC); Why change this here? I'd just start with this in the patch that introduces it. > if (!stats) > return NULL; > > @@ -99,16 +109,17 @@ static struct brute_stats *brute_new_stats(void) > * It's mandatory to disable interrupts before acquiring the brute_stats::lock > * since the task_free hook can be called from an IRQ context during the > * execution of the task_alloc hook. > + * > + * Context: Must be called with interrupts disabled and brute_stats_ptr_lock > + * held. > */ > static void brute_share_stats(struct brute_stats *src, > struct brute_stats **dst) > { > - unsigned long flags; > - > - spin_lock_irqsave(&src->lock, flags); > + spin_lock(&src->lock); > refcount_inc(&src->refc); > *dst = src; > - spin_unlock_irqrestore(&src->lock, flags); > + spin_unlock(&src->lock); > } I still don't think any locking is needed here; the whole function can go away, IMO. > > /** > @@ -126,26 +137,36 @@ static void brute_share_stats(struct brute_stats *src, > * this task and the new one being allocated. Otherwise, share the statistics > * that the current task already has. > * > + * It's mandatory to disable interrupts before acquiring brute_stats_ptr_lock > + * and brute_stats::lock since the task_free hook can be called from an IRQ > + * context during the execution of the task_alloc hook. > + * > * Return: -ENOMEM if the allocation of the new statistics structure fails. Zero > * otherwise. > */ > static int brute_task_alloc(struct task_struct *task, unsigned long clone_flags) > { > struct brute_stats **stats, **p_stats; > + unsigned long flags; > > stats = brute_stats_ptr(task); > p_stats = brute_stats_ptr(current); > + write_lock_irqsave(&brute_stats_ptr_lock, flags); > > if (likely(*p_stats)) { > brute_share_stats(*p_stats, stats); > + write_unlock_irqrestore(&brute_stats_ptr_lock, flags); > return 0; > } > > *stats = brute_new_stats(); > - if (!*stats) > + if (!*stats) { > + write_unlock_irqrestore(&brute_stats_ptr_lock, flags); > return -ENOMEM; > + } > > brute_share_stats(*stats, p_stats); > + write_unlock_irqrestore(&brute_stats_ptr_lock, flags); > return 0; > } I'd much prefer that whatever locking is needed be introduced in the initial patch: this transformation just double the work to review. :) > > @@ -167,9 +188,9 @@ static int brute_task_alloc(struct task_struct *task, unsigned long clone_flags) > * only one task (the task that calls the execve function) points to the data. > * In this case, the previous allocation is used but the statistics are reset. > * > - * It's mandatory to disable interrupts before acquiring the brute_stats::lock > - * since the task_free hook can be called from an IRQ context during the > - * execution of the bprm_committing_creds hook. > + * It's mandatory to disable interrupts before acquiring brute_stats_ptr_lock > + * and brute_stats::lock since the task_free hook can be called from an IRQ > + * context during the execution of the bprm_committing_creds hook. > */ > static void brute_task_execve(struct linux_binprm *bprm) > { > @@ -177,24 +198,33 @@ static void brute_task_execve(struct linux_binprm *bprm) > unsigned long flags; > > stats = brute_stats_ptr(current); > - if (WARN(!*stats, "No statistical data\n")) > + read_lock_irqsave(&brute_stats_ptr_lock, flags); > + > + if (WARN(!*stats, "No statistical data\n")) { > + read_unlock_irqrestore(&brute_stats_ptr_lock, flags); > return; > + } > > - spin_lock_irqsave(&(*stats)->lock, flags); > + spin_lock(&(*stats)->lock); > > if (!refcount_dec_not_one(&(*stats)->refc)) { > /* execve call after an execve call */ > (*stats)->faults = 0; > (*stats)->jiffies = get_jiffies_64(); > (*stats)->period = 0; > - spin_unlock_irqrestore(&(*stats)->lock, flags); > + spin_unlock(&(*stats)->lock); > + read_unlock_irqrestore(&brute_stats_ptr_lock, flags); > return; > } > > /* execve call after a fork call */ > - spin_unlock_irqrestore(&(*stats)->lock, flags); > + spin_unlock(&(*stats)->lock); > + read_unlock_irqrestore(&brute_stats_ptr_lock, flags); > + > + write_lock_irqsave(&brute_stats_ptr_lock, flags); > *stats = brute_new_stats(); > WARN(!*stats, "Cannot allocate statistical data\n"); > + write_unlock_irqrestore(&brute_stats_ptr_lock, flags); > } Again, I don't see a need for locking -- this is just managing the lifetime which is entirely handled by the implicit locking of "current" and the refcount_t. > > /** > @@ -204,9 +234,9 @@ static void brute_task_execve(struct linux_binprm *bprm) > * The statistical data that is shared between all the fork hierarchy processes > * needs to be freed when this hierarchy disappears. > * > - * It's mandatory to disable interrupts before acquiring the brute_stats::lock > - * since the task_free hook can be called from an IRQ context during the > - * execution of the task_free hook. > + * It's mandatory to disable interrupts before acquiring brute_stats_ptr_lock > + * and brute_stats::lock since the task_free hook can be called from an IRQ > + * context during the execution of the task_free hook. > */ > static void brute_task_free(struct task_struct *task) > { > @@ -215,17 +245,446 @@ static void brute_task_free(struct task_struct *task) > bool refc_is_zero; > > stats = brute_stats_ptr(task); > - if (WARN(!*stats, "No statistical data\n")) > + read_lock_irqsave(&brute_stats_ptr_lock, flags); > + > + if (WARN(!*stats, "No statistical data\n")) { > + read_unlock_irqrestore(&brute_stats_ptr_lock, flags); > return; > + } > > - spin_lock_irqsave(&(*stats)->lock, flags); > + spin_lock(&(*stats)->lock); > refc_is_zero = refcount_dec_and_test(&(*stats)->refc); > - spin_unlock_irqrestore(&(*stats)->lock, flags); > + spin_unlock(&(*stats)->lock); > + read_unlock_irqrestore(&brute_stats_ptr_lock, flags); > > if (refc_is_zero) { > + write_lock_irqsave(&brute_stats_ptr_lock, flags); > kfree(*stats); > *stats = NULL; > + write_unlock_irqrestore(&brute_stats_ptr_lock, flags); > + } > +} Same; I would expect this to be simply: stats = brute_stats_ptr(task); if (WARN_ON_ONCE(!*stats)) return; if (refcount_dec_and_test(&(*stats)->refc)) { kfree(*stats); *stats = NULL; } > + > +/* > + * BRUTE_EMA_WEIGHT_NUMERATOR - Weight's numerator of EMA. > + */ > +static const u64 BRUTE_EMA_WEIGHT_NUMERATOR = 7; > + > +/* > + * BRUTE_EMA_WEIGHT_DENOMINATOR - Weight's denominator of EMA. > + */ > +static const u64 BRUTE_EMA_WEIGHT_DENOMINATOR = 10; Should these be externally configurable (via sysfs)? > + > +/** > + * brute_mul_by_ema_weight() - Multiply by EMA weight. > + * @value: Value to multiply by EMA weight. > + * > + * Return: The result of the multiplication operation. > + */ > +static inline u64 brute_mul_by_ema_weight(u64 value) > +{ > + return mul_u64_u64_div_u64(value, BRUTE_EMA_WEIGHT_NUMERATOR, > + BRUTE_EMA_WEIGHT_DENOMINATOR); > +} > + > +/* > + * BRUTE_MAX_FAULTS - Maximum number of faults. > + * > + * If a brute force attack is running slowly for a long time, the application > + * crash period's EMA is not suitable for the detection. This type of attack > + * must be detected using a maximum number of faults. > + */ > +static const unsigned char BRUTE_MAX_FAULTS = 200; Same. > + > +/** > + * brute_update_crash_period() - Update the application crash period. > + * @stats: Statistics that hold the application crash period to update. > + * @now: The current timestamp in jiffies. > + * > + * The application crash period must be a value that is not prone to change due > + * to spurious data and follows the real crash period. So, to compute it, the > + * exponential moving average (EMA) is used. > + * > + * This kind of average defines a weight (between 0 and 1) for the new value to > + * add and applies the remainder of the weight to the current average value. > + * This way, some spurious data will not excessively modify the average and only > + * if the new values are persistent, the moving average will tend towards them. > + * > + * Mathematically the application crash period's EMA can be expressed as > + * follows: > + * > + * period_ema = period * weight + period_ema * (1 - weight) > + * > + * If the operations are applied: > + * > + * period_ema = period * weight + period_ema - period_ema * weight > + * > + * If the operands are ordered: > + * > + * period_ema = period_ema - period_ema * weight + period * weight > + * > + * Finally, this formula can be written as follows: > + * > + * period_ema -= period_ema * weight; > + * period_ema += period * weight; > + * > + * The statistics that hold the application crash period to update cannot be > + * NULL. > + * > + * It's mandatory to disable interrupts before acquiring the brute_stats::lock > + * since the task_free hook can be called from an IRQ context during the > + * execution of the task_fatal_signal hook. > + * > + * Context: Must be called with interrupts disabled and brute_stats_ptr_lock > + * held. > + * Return: The last crash timestamp before updating it. > + */ > +static u64 brute_update_crash_period(struct brute_stats *stats, u64 now) > +{ > + u64 current_period; > + u64 last_crash_timestamp; > + > + spin_lock(&stats->lock); > + current_period = now - stats->jiffies; > + last_crash_timestamp = stats->jiffies; > + stats->jiffies = now; > + > + stats->period -= brute_mul_by_ema_weight(stats->period); > + stats->period += brute_mul_by_ema_weight(current_period); > + > + if (stats->faults < BRUTE_MAX_FAULTS) > + stats->faults += 1; > + > + spin_unlock(&stats->lock); > + return last_crash_timestamp; > +} Now *here* locking makes sense, and it only needs to be per-stat, not global, since multiple processes may be operating on the same stat struct. To make this more no-reader-locking-friendly, I'd also update everything at the end, and use WRITE_ONCE(): u64 current_period, period; u64 last_crash_timestamp; u64 faults; spin_lock(&stats->lock); current_period = now - stats->jiffies; last_crash_timestamp = stats->jiffies; WRITE_ONCE(stats->period, stats->period - brute_mul_by_ema_weight(stats->period) + brute_mul_by_ema_weight(current_period)); if (stats->faults < BRUTE_MAX_FAULTS) WRITE_ONCE(stats->faults, stats->faults + 1); WRITE_ONCE(stats->jiffies, now); spin_unlock(&stats->lock); return last_crash_timestamp; That way readers can (IIUC) safely use READ_ONCE() on jiffies and faults without needing to hold the &stats->lock (unless they need perfectly matching jiffies, period, and faults). > + > +/* > + * BRUTE_MIN_FAULTS - Minimum number of faults. > + * > + * The application crash period's EMA cannot be used until a minimum number of > + * data has been applied to it. This constraint allows getting a trend when this > + * moving average is used. Moreover, it avoids the scenario where an application > + * fails quickly from execve system call due to reasons unrelated to a real > + * attack. > + */ > +static const unsigned char BRUTE_MIN_FAULTS = 5; > + > +/* > + * BRUTE_CRASH_PERIOD_THRESHOLD - Application crash period threshold. > + * > + * The units are expressed in milliseconds. > + * > + * A fast brute force attack is detected when the application crash period falls > + * below this threshold. > + */ > +static const u64 BRUTE_CRASH_PERIOD_THRESHOLD = 30000; These could all be sysctls (see yama's use of sysctl). > + > +/** > + * brute_attack_running() - Test if a brute force attack is happening. > + * @stats: Statistical data shared by all the fork hierarchy processes. > + * > + * The decision if a brute force attack is running is based on the statistical > + * data shared by all the fork hierarchy processes. This statistics cannot be > + * NULL. > + * > + * There are two types of brute force attacks that can be detected using the > + * statistical data. The first one is a slow brute force attack that is detected > + * if the maximum number of faults per fork hierarchy is reached. The second > + * type is a fast brute force attack that is detected if the application crash > + * period falls below a certain threshold. > + * > + * Moreover, it is important to note that no attacks will be detected until a > + * minimum number of faults have occurred. This allows to have a trend in the > + * crash period when the EMA is used and also avoids the scenario where an > + * application fails quickly from execve system call due to reasons unrelated to > + * a real attack. > + * > + * It's mandatory to disable interrupts before acquiring the brute_stats::lock > + * since the task_free hook can be called from an IRQ context during the > + * execution of the task_fatal_signal hook. > + * > + * Context: Must be called with interrupts disabled and brute_stats_ptr_lock > + * held. > + * Return: True if a brute force attack is happening. False otherwise. > + */ > +static bool brute_attack_running(struct brute_stats *stats) > +{ > + u64 crash_period; > + > + spin_lock(&stats->lock); > + if (stats->faults < BRUTE_MIN_FAULTS) { > + spin_unlock(&stats->lock); > + return false; > + } If I'm reading this correctly, you're performing two tests, so there isn't a strict relationship between faults and period for this test, and I think it could be done without locking with READ_ONCE(): u64 faults; u64 crash_period; faults = READ_ONCE(stats->faults); if (faults < BRUTE_MIN_FAULTS) return false; if (faults >= BRUTE_MAX_FAULTS) return true; crash_period = jiffies64_to_msecs(READ_ONCE(stats->period)); return crash_period < BRUTE_CRASH_PERIOD_THRESHOLD; > + > + if (stats->faults >= BRUTE_MAX_FAULTS) { > + spin_unlock(&stats->lock); > + return true; > + } > + > + crash_period = jiffies64_to_msecs(stats->period); > + spin_unlock(&stats->lock); > + > + return crash_period < BRUTE_CRASH_PERIOD_THRESHOLD; > +} > + > +/** > + * print_fork_attack_running() - Warn about a fork brute force attack. > + */ > +static inline void print_fork_attack_running(void) > +{ > + pr_warn("Fork brute force attack detected [%s]\n", current->comm); > +} I think pid should be part of this... > + > +/** > + * brute_manage_fork_attack() - Manage a fork brute force attack. > + * @stats: Statistical data shared by all the fork hierarchy processes. > + * @now: The current timestamp in jiffies. > + * > + * For a correct management of a fork brute force attack it is only necessary to > + * update the statistics and test if an attack is happening based on these data. > + * > + * The statistical data shared by all the fork hierarchy processes cannot be > + * NULL. > + * > + * It's mandatory to disable interrupts before acquiring the brute_stats::lock > + * since the task_free hook can be called from an IRQ context during the > + * execution of the task_fatal_signal hook. > + * > + * Context: Must be called with interrupts disabled and brute_stats_ptr_lock > + * held. > + * Return: The last crash timestamp before updating it. > + */ > +static u64 brute_manage_fork_attack(struct brute_stats *stats, u64 now) > +{ > + u64 last_fork_crash; > + > + last_fork_crash = brute_update_crash_period(stats, now); > + if (brute_attack_running(stats)) > + print_fork_attack_running(); > + > + return last_fork_crash; > +} > + > +/** > + * brute_get_exec_stats() - Get the exec statistics. > + * @stats: When this function is called, this parameter must point to the > + * current process' statistical data. When this function returns, this > + * parameter points to the parent process' statistics of the fork > + * hierarchy that hold the current process' statistics. > + * > + * To manage a brute force attack that happens through the execve system call it > + * is not possible to use the statistical data hold by this process due to these > + * statistics disappear when this task is finished. In this scenario this data > + * should be tracked by the statistics of a higher fork hierarchy (the hierarchy > + * that contains the process that forks before the execve system call). > + * > + * To find these statistics the current fork hierarchy must be traversed up > + * until new statistics are found. > + * > + * Context: Must be called with tasklist_lock and brute_stats_ptr_lock held. > + */ > +static void brute_get_exec_stats(struct brute_stats **stats) > +{ > + const struct task_struct *task = current; > + struct brute_stats **p_stats; > + > + do { > + if (!task->real_parent) { > + *stats = NULL; > + return; > + } > + > + p_stats = brute_stats_ptr(task->real_parent); > + task = task->real_parent; > + } while (*stats == *p_stats); > + > + *stats = *p_stats; > +} See Yama's task_is_descendant() for how to walk up the process tree (and I think the process group stuff will save some steps too); you don't need tasklist_lock held, just rcu_read_lock held, AIUI: Documentation/RCU/listRCU.rst And since you're passing this stats struct back up, and it would be outside of rcu read lock, you'd want to do a "get" on it first: rcu_read_lock(); loop { ... } refcount_inc_not_zero(&(*p_stats)->refc); rcu_read_unlock(); *stats = *p_stats > + > +/** > + * brute_update_exec_crash_period() - Update the exec crash period. > + * @stats: When this function is called, this parameter must point to the > + * current process' statistical data. When this function returns, this > + * parameter points to the updated statistics (statistics that track the > + * info to manage a brute force attack that happens through the execve > + * system call). > + * @now: The current timestamp in jiffies. > + * @last_fork_crash: The last fork crash timestamp before updating it. > + * > + * If this is the first update of the statistics used to manage a brute force > + * attack that happens through the execve system call, its last crash timestamp > + * (the timestamp that shows when the execve was called) cannot be used to > + * compute the crash period's EMA. Instead, the last fork crash timestamp should > + * be used (the last crash timestamp of the child fork hierarchy before updating > + * the crash period). This allows that in a brute force attack that happens > + * through the fork system call, the exec and fork statistics are the same. In > + * this situation, the mitigation method will act only in the processes that are > + * sharing the fork statistics. This way, the process that forked before the > + * execve system call will not be involved in the mitigation method. In this > + * scenario, the parent is not responsible of the child's behaviour. > + * > + * It's mandatory to disable interrupts before acquiring the brute_stats::lock > + * since the task_free hook can be called from an IRQ context during the > + * execution of the task_fatal_signal hook. > + * > + * Context: Must be called with interrupts disabled and tasklist_lock and > + * brute_stats_ptr_lock held. > + * Return: -EFAULT if there are no exec statistics. Zero otherwise. > + */ > +static int brute_update_exec_crash_period(struct brute_stats **stats, > + u64 now, u64 last_fork_crash) > +{ > + brute_get_exec_stats(stats); > + if (!*stats) > + return -EFAULT; This isn't EFAULT (userspace memory fault), but rather more EINVAL or ESRCH. > + > + spin_lock(&(*stats)->lock); > + if (!(*stats)->faults) > + (*stats)->jiffies = last_fork_crash; > + spin_unlock(&(*stats)->lock); > + > + brute_update_crash_period(*stats, now); and then you can add: if (refcount_dec_and_test(&(*stats)->refc)) kfree(*stats); (or better yet, make that a helper) named something like "put_brute_stats". > + return 0; > +} I find the re-writing of **stats confusing here -- I think you should leave that unmodified, and instead return a pointer (instead of "int"), and for errors, use ERR_PTR(-ESRCH) > + > +/** > + * brute_get_crash_period() - Get the application crash period. > + * @stats: Statistical data shared by all the fork hierarchy processes. > + * > + * The statistical data shared by all the fork hierarchy processes cannot be > + * NULL. > + * > + * It's mandatory to disable interrupts before acquiring the brute_stats::lock > + * since the task_free hook can be called from an IRQ context during the > + * execution of the task_fatal_signal hook. > + * > + * Context: Must be called with interrupts disabled and brute_stats_ptr_lock > + * held. > + * Return: The application crash period. > + */ > +static u64 brute_get_crash_period(struct brute_stats *stats) > +{ > + u64 crash_period; > + > + spin_lock(&stats->lock); > + crash_period = stats->period; > + spin_unlock(&stats->lock); > + > + return crash_period; > +} return READ_ONCE(stats->period); > + > +/** > + * print_exec_attack_running() - Warn about an exec brute force attack. > + * @stats: Statistical data shared by all the fork hierarchy processes. > + * > + * The statistical data shared by all the fork hierarchy processes cannot be > + * NULL. > + * > + * Before showing the process name it is mandatory to find a process that holds > + * a pointer to the exec statistics. > + * > + * Context: Must be called with tasklist_lock and brute_stats_ptr_lock held. > + */ > +static void print_exec_attack_running(const struct brute_stats *stats) > +{ > + struct task_struct *p; > + struct brute_stats **p_stats; > + bool found = false; > + > + for_each_process(p) { > + p_stats = brute_stats_ptr(p); > + if (*p_stats == stats) { > + found = true; > + break; > + } > + } > + > + if (WARN(!found, "No exec process\n")) > + return; > + > + pr_warn("Exec brute force attack detected [%s]\n", p->comm); > +} Same logic to change here as above for talking the process list. (IIUC, since you're only reading, you don't need tasklist_lock, just rcu_read_lock.) But, if I'm reading this right, you only ever call this with "current". It seems like it would be way more efficient to just use "current" instead? > + > +/** > + * brute_manage_exec_attack() - Manage an exec brute force attack. > + * @stats: Statistical data shared by all the fork hierarchy processes. > + * @now: The current timestamp in jiffies. > + * @last_fork_crash: The last fork crash timestamp before updating it. > + * > + * For a correct management of an exec brute force attack it is only necessary > + * to update the exec statistics and test if an attack is happening based on > + * these data. > + * > + * It is important to note that if the fork and exec crash periods are the same, > + * the attack test is avoided. This allows that in a brute force attack that > + * happens through the fork system call, the mitigation method does not act on > + * the parent process of the fork hierarchy. > + * > + * The statistical data shared by all the fork hierarchy processes cannot be > + * NULL. > + * > + * It's mandatory to disable interrupts before acquiring the brute_stats::lock > + * since the task_free hook can be called from an IRQ context during the > + * execution of the task_fatal_signal hook. > + * > + * Context: Must be called with interrupts disabled and tasklist_lock and > + * brute_stats_ptr_lock held. > + */ > +static void brute_manage_exec_attack(struct brute_stats *stats, u64 now, > + u64 last_fork_crash) > +{ > + int ret; > + struct brute_stats *exec_stats = stats; > + u64 fork_period; > + u64 exec_period; > + > + ret = brute_update_exec_crash_period(&exec_stats, now, last_fork_crash); > + if (WARN(ret, "No exec statistical data\n")) > + return; I think this should fail closed: if there's a static processing error, treat it as an attack. > + > + fork_period = brute_get_crash_period(stats); > + exec_period = brute_get_crash_period(exec_stats); > + if (fork_period == exec_period) > + return; > + > + if (brute_attack_running(exec_stats)) > + print_exec_attack_running(exec_stats); > +} > + > +/** > + * brute_task_fatal_signal() - Target for the task_fatal_signal hook. > + * @siginfo: Contains the signal information. > + * > + * To detect a brute force attack is necessary to update the fork and exec > + * statistics in every fatal crash and act based on these data. > + * > + * It's mandatory to disable interrupts before acquiring brute_stats_ptr_lock > + * and brute_stats::lock since the task_free hook can be called from an IRQ > + * context during the execution of the task_fatal_signal hook. > + */ > +static void brute_task_fatal_signal(const kernel_siginfo_t *siginfo) > +{ > + struct brute_stats **stats; > + unsigned long flags; > + u64 last_fork_crash; > + u64 now = get_jiffies_64(); > + > + stats = brute_stats_ptr(current); > + read_lock(&tasklist_lock); > + read_lock_irqsave(&brute_stats_ptr_lock, flags); > + > + if (WARN(!*stats, "No statistical data\n")) { > + read_unlock_irqrestore(&brute_stats_ptr_lock, flags); > + read_unlock(&tasklist_lock); > + return; > } > + > + last_fork_crash = brute_manage_fork_attack(*stats, now); > + brute_manage_exec_attack(*stats, now, last_fork_crash); > + read_unlock_irqrestore(&brute_stats_ptr_lock, flags); > + read_unlock(&tasklist_lock); > } > > /* > @@ -235,6 +694,7 @@ static struct security_hook_list brute_hooks[] __lsm_ro_after_init = { > LSM_HOOK_INIT(task_alloc, brute_task_alloc), > LSM_HOOK_INIT(bprm_committing_creds, brute_task_execve), > LSM_HOOK_INIT(task_free, brute_task_free), > + LSM_HOOK_INIT(task_fatal_signal, brute_task_fatal_signal), > }; > > /** > -- > 2.25.1 > I think this is very close!
On Wed, Mar 17, 2021 at 07:57:10PM -0700, Kees Cook wrote: > On Sun, Mar 07, 2021 at 12:30:26PM +0100, John Wood wrote: > > @@ -74,7 +84,7 @@ static struct brute_stats *brute_new_stats(void) > > { > > struct brute_stats *stats; > > > > - stats = kmalloc(sizeof(struct brute_stats), GFP_KERNEL); > > + stats = kmalloc(sizeof(struct brute_stats), GFP_ATOMIC); > > Why change this here? I'd just start with this in the patch that > introduces it. To be coherent in the previous patch. In the previous patch the kmalloc could use GFP_KERNEL due to the call was made out of an atomic context. Now, with the new lock it needs GFP_ATOMIC. So the question: If finally it need to use GFP_ATOMIC, the first patch need to use it even if it is not necessary? > > if (!stats) > > return NULL; > > > > @@ -99,16 +109,17 @@ static struct brute_stats *brute_new_stats(void) > > * It's mandatory to disable interrupts before acquiring the brute_stats::lock > > * since the task_free hook can be called from an IRQ context during the > > * execution of the task_alloc hook. > > + * > > + * Context: Must be called with interrupts disabled and brute_stats_ptr_lock > > + * held. > > */ > > static void brute_share_stats(struct brute_stats *src, > > struct brute_stats **dst) > > { > > - unsigned long flags; > > - > > - spin_lock_irqsave(&src->lock, flags); > > + spin_lock(&src->lock); > > refcount_inc(&src->refc); > > *dst = src; > > - spin_unlock_irqrestore(&src->lock, flags); > > + spin_unlock(&src->lock); > > } > > I still don't think any locking is needed here; the whole function can > go away, IMO. In this case I think this is possible: Scenario 1: cpu 1 writes the stats pointer and cpu 2 is navigating the processes tree reading the same stats pointer. Scenario 2: cpu 1 is navigating the processes tree reading the stats pointer and in IRQ the same stats pointer is wrote. So, we need locking. Am I wrong? > > /** > > @@ -126,26 +137,36 @@ static void brute_share_stats(struct brute_stats *src, > > * this task and the new one being allocated. Otherwise, share the statistics > > * that the current task already has. > > * > > + * It's mandatory to disable interrupts before acquiring brute_stats_ptr_lock > > + * and brute_stats::lock since the task_free hook can be called from an IRQ > > + * context during the execution of the task_alloc hook. > > + * > > * Return: -ENOMEM if the allocation of the new statistics structure fails. Zero > > * otherwise. > > */ > > static int brute_task_alloc(struct task_struct *task, unsigned long clone_flags) > > { > > struct brute_stats **stats, **p_stats; > > + unsigned long flags; > > > > stats = brute_stats_ptr(task); > > p_stats = brute_stats_ptr(current); > > + write_lock_irqsave(&brute_stats_ptr_lock, flags); > > > > if (likely(*p_stats)) { > > brute_share_stats(*p_stats, stats); > > + write_unlock_irqrestore(&brute_stats_ptr_lock, flags); > > return 0; > > } > > > > *stats = brute_new_stats(); > > - if (!*stats) > > + if (!*stats) { > > + write_unlock_irqrestore(&brute_stats_ptr_lock, flags); > > return -ENOMEM; > > + } > > > > brute_share_stats(*stats, p_stats); > > + write_unlock_irqrestore(&brute_stats_ptr_lock, flags); > > return 0; > > } > > I'd much prefer that whatever locking is needed be introduced in the > initial patch: this transformation just double the work to review. :) So, IIUC I need to introduce all the locks in the initial patch even if they are not necessary. Am I right? > > > > @@ -167,9 +188,9 @@ static int brute_task_alloc(struct task_struct *task, unsigned long clone_flags) > > * only one task (the task that calls the execve function) points to the data. > > * In this case, the previous allocation is used but the statistics are reset. > > * > > - * It's mandatory to disable interrupts before acquiring the brute_stats::lock > > - * since the task_free hook can be called from an IRQ context during the > > - * execution of the bprm_committing_creds hook. > > + * It's mandatory to disable interrupts before acquiring brute_stats_ptr_lock > > + * and brute_stats::lock since the task_free hook can be called from an IRQ > > + * context during the execution of the bprm_committing_creds hook. > > */ > > static void brute_task_execve(struct linux_binprm *bprm) > > { > > @@ -177,24 +198,33 @@ static void brute_task_execve(struct linux_binprm *bprm) > > unsigned long flags; > > > > stats = brute_stats_ptr(current); > > - if (WARN(!*stats, "No statistical data\n")) > > + read_lock_irqsave(&brute_stats_ptr_lock, flags); > > + > > + if (WARN(!*stats, "No statistical data\n")) { > > + read_unlock_irqrestore(&brute_stats_ptr_lock, flags); > > return; > > + } > > > > - spin_lock_irqsave(&(*stats)->lock, flags); > > + spin_lock(&(*stats)->lock); > > > > if (!refcount_dec_not_one(&(*stats)->refc)) { > > /* execve call after an execve call */ > > (*stats)->faults = 0; > > (*stats)->jiffies = get_jiffies_64(); > > (*stats)->period = 0; > > - spin_unlock_irqrestore(&(*stats)->lock, flags); > > + spin_unlock(&(*stats)->lock); > > + read_unlock_irqrestore(&brute_stats_ptr_lock, flags); > > return; > > } > > > > /* execve call after a fork call */ > > - spin_unlock_irqrestore(&(*stats)->lock, flags); > > + spin_unlock(&(*stats)->lock); > > + read_unlock_irqrestore(&brute_stats_ptr_lock, flags); > > + > > + write_lock_irqsave(&brute_stats_ptr_lock, flags); > > *stats = brute_new_stats(); > > WARN(!*stats, "Cannot allocate statistical data\n"); > > + write_unlock_irqrestore(&brute_stats_ptr_lock, flags); > > } > > Again, I don't see a need for locking -- this is just managing the > lifetime which is entirely handled by the implicit locking of "current" > and the refcount_t. Here I can see the same two scenarios noted before. So I think the locking is needed. Am I right? > > /** > > @@ -204,9 +234,9 @@ static void brute_task_execve(struct linux_binprm *bprm) > > * The statistical data that is shared between all the fork hierarchy processes > > * needs to be freed when this hierarchy disappears. > > * > > - * It's mandatory to disable interrupts before acquiring the brute_stats::lock > > - * since the task_free hook can be called from an IRQ context during the > > - * execution of the task_free hook. > > + * It's mandatory to disable interrupts before acquiring brute_stats_ptr_lock > > + * and brute_stats::lock since the task_free hook can be called from an IRQ > > + * context during the execution of the task_free hook. > > */ > > static void brute_task_free(struct task_struct *task) > > { > > @@ -215,17 +245,446 @@ static void brute_task_free(struct task_struct *task) > > bool refc_is_zero; > > > > stats = brute_stats_ptr(task); > > - if (WARN(!*stats, "No statistical data\n")) > > + read_lock_irqsave(&brute_stats_ptr_lock, flags); > > + > > + if (WARN(!*stats, "No statistical data\n")) { > > + read_unlock_irqrestore(&brute_stats_ptr_lock, flags); > > return; > > + } > > > > - spin_lock_irqsave(&(*stats)->lock, flags); > > + spin_lock(&(*stats)->lock); > > refc_is_zero = refcount_dec_and_test(&(*stats)->refc); > > - spin_unlock_irqrestore(&(*stats)->lock, flags); > > + spin_unlock(&(*stats)->lock); > > + read_unlock_irqrestore(&brute_stats_ptr_lock, flags); > > > > if (refc_is_zero) { > > + write_lock_irqsave(&brute_stats_ptr_lock, flags); > > kfree(*stats); > > *stats = NULL; > > + write_unlock_irqrestore(&brute_stats_ptr_lock, flags); > > + } > > +} > > Same; I would expect this to be simply: No comment. I think I am missing something. I need to clarify the previous cases before to work on the next ones. Sorry and thanks for the guidance. > stats = brute_stats_ptr(task); > if (WARN_ON_ONCE(!*stats)) > return; > if (refcount_dec_and_test(&(*stats)->refc)) { > kfree(*stats); > *stats = NULL; > } > > > + > > +/* > > + * BRUTE_EMA_WEIGHT_NUMERATOR - Weight's numerator of EMA. > > + */ > > +static const u64 BRUTE_EMA_WEIGHT_NUMERATOR = 7; > > + > > +/* > > + * BRUTE_EMA_WEIGHT_DENOMINATOR - Weight's denominator of EMA. > > + */ > > +static const u64 BRUTE_EMA_WEIGHT_DENOMINATOR = 10; > > Should these be externally configurable (via sysfs)? No problem. I think this is easier than locking :) > > > + > > +/** > > + * brute_mul_by_ema_weight() - Multiply by EMA weight. > > + * @value: Value to multiply by EMA weight. > > + * > > + * Return: The result of the multiplication operation. > > + */ > > +static inline u64 brute_mul_by_ema_weight(u64 value) > > +{ > > + return mul_u64_u64_div_u64(value, BRUTE_EMA_WEIGHT_NUMERATOR, > > + BRUTE_EMA_WEIGHT_DENOMINATOR); > > +} > > + > > +/* > > + * BRUTE_MAX_FAULTS - Maximum number of faults. > > + * > > + * If a brute force attack is running slowly for a long time, the application > > + * crash period's EMA is not suitable for the detection. This type of attack > > + * must be detected using a maximum number of faults. > > + */ > > +static const unsigned char BRUTE_MAX_FAULTS = 200; > > Same. Ok, understood. > > > + > > +/** > > + * brute_update_crash_period() - Update the application crash period. > > + * @stats: Statistics that hold the application crash period to update. > > + * @now: The current timestamp in jiffies. > > + * > > + * The application crash period must be a value that is not prone to change due > > + * to spurious data and follows the real crash period. So, to compute it, the > > + * exponential moving average (EMA) is used. > > + * > > + * This kind of average defines a weight (between 0 and 1) for the new value to > > + * add and applies the remainder of the weight to the current average value. > > + * This way, some spurious data will not excessively modify the average and only > > + * if the new values are persistent, the moving average will tend towards them. > > + * > > + * Mathematically the application crash period's EMA can be expressed as > > + * follows: > > + * > > + * period_ema = period * weight + period_ema * (1 - weight) > > + * > > + * If the operations are applied: > > + * > > + * period_ema = period * weight + period_ema - period_ema * weight > > + * > > + * If the operands are ordered: > > + * > > + * period_ema = period_ema - period_ema * weight + period * weight > > + * > > + * Finally, this formula can be written as follows: > > + * > > + * period_ema -= period_ema * weight; > > + * period_ema += period * weight; > > + * > > + * The statistics that hold the application crash period to update cannot be > > + * NULL. > > + * > > + * It's mandatory to disable interrupts before acquiring the brute_stats::lock > > + * since the task_free hook can be called from an IRQ context during the > > + * execution of the task_fatal_signal hook. > > + * > > + * Context: Must be called with interrupts disabled and brute_stats_ptr_lock > > + * held. > > + * Return: The last crash timestamp before updating it. > > + */ > > +static u64 brute_update_crash_period(struct brute_stats *stats, u64 now) > > +{ > > + u64 current_period; > > + u64 last_crash_timestamp; > > + > > + spin_lock(&stats->lock); > > + current_period = now - stats->jiffies; > > + last_crash_timestamp = stats->jiffies; > > + stats->jiffies = now; > > + > > + stats->period -= brute_mul_by_ema_weight(stats->period); > > + stats->period += brute_mul_by_ema_weight(current_period); > > + > > + if (stats->faults < BRUTE_MAX_FAULTS) > > + stats->faults += 1; > > + > > + spin_unlock(&stats->lock); > > + return last_crash_timestamp; > > +} > > Now *here* locking makes sense, and it only needs to be per-stat, not > global, since multiple processes may be operating on the same stat > struct. To make this more no-reader-locking-friendly, I'd also update > everything at the end, and use WRITE_ONCE(): > > u64 current_period, period; > u64 last_crash_timestamp; > u64 faults; > > spin_lock(&stats->lock); > current_period = now - stats->jiffies; > last_crash_timestamp = stats->jiffies; > > WRITE_ONCE(stats->period, > stats->period - brute_mul_by_ema_weight(stats->period) + > brute_mul_by_ema_weight(current_period)); > > if (stats->faults < BRUTE_MAX_FAULTS) > WRITE_ONCE(stats->faults, stats->faults + 1); > > WRITE_ONCE(stats->jiffies, now); > > spin_unlock(&stats->lock); > return last_crash_timestamp; > > That way readers can (IIUC) safely use READ_ONCE() on jiffies and faults > without needing to hold the &stats->lock (unless they need perfectly matching > jiffies, period, and faults). Thanks for the refactory. I will work on it (if I can understand locking). :( > > + > > +/* > > + * BRUTE_MIN_FAULTS - Minimum number of faults. > > + * > > + * The application crash period's EMA cannot be used until a minimum number of > > + * data has been applied to it. This constraint allows getting a trend when this > > + * moving average is used. Moreover, it avoids the scenario where an application > > + * fails quickly from execve system call due to reasons unrelated to a real > > + * attack. > > + */ > > +static const unsigned char BRUTE_MIN_FAULTS = 5; > > + > > +/* > > + * BRUTE_CRASH_PERIOD_THRESHOLD - Application crash period threshold. > > + * > > + * The units are expressed in milliseconds. > > + * > > + * A fast brute force attack is detected when the application crash period falls > > + * below this threshold. > > + */ > > +static const u64 BRUTE_CRASH_PERIOD_THRESHOLD = 30000; > > These could all be sysctls (see yama's use of sysctl). Ok > > + > > +/** > > + * brute_attack_running() - Test if a brute force attack is happening. > > + * @stats: Statistical data shared by all the fork hierarchy processes. > > + * > > + * The decision if a brute force attack is running is based on the statistical > > + * data shared by all the fork hierarchy processes. This statistics cannot be > > + * NULL. > > + * > > + * There are two types of brute force attacks that can be detected using the > > + * statistical data. The first one is a slow brute force attack that is detected > > + * if the maximum number of faults per fork hierarchy is reached. The second > > + * type is a fast brute force attack that is detected if the application crash > > + * period falls below a certain threshold. > > + * > > + * Moreover, it is important to note that no attacks will be detected until a > > + * minimum number of faults have occurred. This allows to have a trend in the > > + * crash period when the EMA is used and also avoids the scenario where an > > + * application fails quickly from execve system call due to reasons unrelated to > > + * a real attack. > > + * > > + * It's mandatory to disable interrupts before acquiring the brute_stats::lock > > + * since the task_free hook can be called from an IRQ context during the > > + * execution of the task_fatal_signal hook. > > + * > > + * Context: Must be called with interrupts disabled and brute_stats_ptr_lock > > + * held. > > + * Return: True if a brute force attack is happening. False otherwise. > > + */ > > +static bool brute_attack_running(struct brute_stats *stats) > > +{ > > + u64 crash_period; > > + > > + spin_lock(&stats->lock); > > + if (stats->faults < BRUTE_MIN_FAULTS) { > > + spin_unlock(&stats->lock); > > + return false; > > + } > > If I'm reading this correctly, you're performing two tests, so there > isn't a strict relationship between faults and period for this test, > and I think it could be done without locking with READ_ONCE(): > > u64 faults; > u64 crash_period; > > faults = READ_ONCE(stats->faults); > if (faults < BRUTE_MIN_FAULTS) > return false; > if (faults >= BRUTE_MAX_FAULTS) > return true; > > crash_period = jiffies64_to_msecs(READ_ONCE(stats->period)); > return crash_period < BRUTE_CRASH_PERIOD_THRESHOLD; Thanks, I will work on it for the next version. > > + > > + if (stats->faults >= BRUTE_MAX_FAULTS) { > > + spin_unlock(&stats->lock); > > + return true; > > + } > > + > > + crash_period = jiffies64_to_msecs(stats->period); > > + spin_unlock(&stats->lock); > > + > > + return crash_period < BRUTE_CRASH_PERIOD_THRESHOLD; > > +} > > + > > +/** > > + * print_fork_attack_running() - Warn about a fork brute force attack. > > + */ > > +static inline void print_fork_attack_running(void) > > +{ > > + pr_warn("Fork brute force attack detected [%s]\n", current->comm); > > +} > > I think pid should be part of this... No problem. > > + > > +/** > > + * brute_manage_fork_attack() - Manage a fork brute force attack. > > + * @stats: Statistical data shared by all the fork hierarchy processes. > > + * @now: The current timestamp in jiffies. > > + * > > + * For a correct management of a fork brute force attack it is only necessary to > > + * update the statistics and test if an attack is happening based on these data. > > + * > > + * The statistical data shared by all the fork hierarchy processes cannot be > > + * NULL. > > + * > > + * It's mandatory to disable interrupts before acquiring the brute_stats::lock > > + * since the task_free hook can be called from an IRQ context during the > > + * execution of the task_fatal_signal hook. > > + * > > + * Context: Must be called with interrupts disabled and brute_stats_ptr_lock > > + * held. > > + * Return: The last crash timestamp before updating it. > > + */ > > +static u64 brute_manage_fork_attack(struct brute_stats *stats, u64 now) > > +{ > > + u64 last_fork_crash; > > + > > + last_fork_crash = brute_update_crash_period(stats, now); > > + if (brute_attack_running(stats)) > > + print_fork_attack_running(); > > + > > + return last_fork_crash; > > +} > > + > > +/** > > + * brute_get_exec_stats() - Get the exec statistics. > > + * @stats: When this function is called, this parameter must point to the > > + * current process' statistical data. When this function returns, this > > + * parameter points to the parent process' statistics of the fork > > + * hierarchy that hold the current process' statistics. > > + * > > + * To manage a brute force attack that happens through the execve system call it > > + * is not possible to use the statistical data hold by this process due to these > > + * statistics disappear when this task is finished. In this scenario this data > > + * should be tracked by the statistics of a higher fork hierarchy (the hierarchy > > + * that contains the process that forks before the execve system call). > > + * > > + * To find these statistics the current fork hierarchy must be traversed up > > + * until new statistics are found. > > + * > > + * Context: Must be called with tasklist_lock and brute_stats_ptr_lock held. > > + */ > > +static void brute_get_exec_stats(struct brute_stats **stats) > > +{ > > + const struct task_struct *task = current; > > + struct brute_stats **p_stats; > > + > > + do { > > + if (!task->real_parent) { > > + *stats = NULL; > > + return; > > + } > > + > > + p_stats = brute_stats_ptr(task->real_parent); > > + task = task->real_parent; > > + } while (*stats == *p_stats); > > + > > + *stats = *p_stats; > > +} > > See Yama's task_is_descendant() for how to walk up the process tree > (and I think the process group stuff will save some steps too); you > don't need tasklist_lock held, just rcu_read_lock held, AIUI: > Documentation/RCU/listRCU.rst > > And since you're passing this stats struct back up, and it would be outside of rcu read lock, you'd want to do a "get" on it first: > > rcu_read_lock(); > loop { > ... > } > refcount_inc_not_zero(&(*p_stats)->refc); > rcu_read_unlock(); > > *stats = *p_stats Thanks for the suggestions. I will work on it for the next version. Anyway, in the first version Kees Cook and Jann Horn noted that some tasks could escape the rcu read lock and that alternate locking were needed. Extract from the RFC: [Kees Cook] Can't newly created processes escape this RCU read lock? I think this need alternate locking, or something in the task_alloc hook that will block any new process from being created within the stats group. [Jann Horn] Good point; the proper way to deal with this would probably be to take the tasklist_lock in read mode around this loop (with read_lock(&tasklist_lock) / read_unlock(&tasklist_lock)), which pairs with the write_lock_irq(&tasklist_lock) in copy_process(). Thanks to the fatal_signal_pending() check while holding the lock in copy_process(), that would be race-free - any fork() that has not yet inserted the new task into the global task list would wait for us to drop the tasklist_lock, then bail out at the fatal_signal_pending() check. I think that this scenario is still possible. So the tasklist_lock is necessary. Am I right? > > + > > +/** > > + * brute_update_exec_crash_period() - Update the exec crash period. > > + * @stats: When this function is called, this parameter must point to the > > + * current process' statistical data. When this function returns, this > > + * parameter points to the updated statistics (statistics that track the > > + * info to manage a brute force attack that happens through the execve > > + * system call). > > + * @now: The current timestamp in jiffies. > > + * @last_fork_crash: The last fork crash timestamp before updating it. > > + * > > + * If this is the first update of the statistics used to manage a brute force > > + * attack that happens through the execve system call, its last crash timestamp > > + * (the timestamp that shows when the execve was called) cannot be used to > > + * compute the crash period's EMA. Instead, the last fork crash timestamp should > > + * be used (the last crash timestamp of the child fork hierarchy before updating > > + * the crash period). This allows that in a brute force attack that happens > > + * through the fork system call, the exec and fork statistics are the same. In > > + * this situation, the mitigation method will act only in the processes that are > > + * sharing the fork statistics. This way, the process that forked before the > > + * execve system call will not be involved in the mitigation method. In this > > + * scenario, the parent is not responsible of the child's behaviour. > > + * > > + * It's mandatory to disable interrupts before acquiring the brute_stats::lock > > + * since the task_free hook can be called from an IRQ context during the > > + * execution of the task_fatal_signal hook. > > + * > > + * Context: Must be called with interrupts disabled and tasklist_lock and > > + * brute_stats_ptr_lock held. > > + * Return: -EFAULT if there are no exec statistics. Zero otherwise. > > + */ > > +static int brute_update_exec_crash_period(struct brute_stats **stats, > > + u64 now, u64 last_fork_crash) > > +{ > > + brute_get_exec_stats(stats); > > + if (!*stats) > > + return -EFAULT; > > This isn't EFAULT (userspace memory fault), but rather more EINVAL or > ESRCH. Ok. > > + > > + spin_lock(&(*stats)->lock); > > + if (!(*stats)->faults) > > + (*stats)->jiffies = last_fork_crash; > > + spin_unlock(&(*stats)->lock); > > + > > + brute_update_crash_period(*stats, now); > > and then you can add: > > if (refcount_dec_and_test(&(*stats)->refc)) > kfree(*stats); > > (or better yet, make that a helper) named something like > "put_brute_stats". Sorry, but I don't understand why we need to free the stats here. What is the rationale behind this change? > > + return 0; > > +} > > I find the re-writing of **stats confusing here -- I think you should > leave that unmodified, and instead return a pointer (instead of "int"), > and for errors, use ERR_PTR(-ESRCH) Ok, thanks. > > + > > +/** > > + * brute_get_crash_period() - Get the application crash period. > > + * @stats: Statistical data shared by all the fork hierarchy processes. > > + * > > + * The statistical data shared by all the fork hierarchy processes cannot be > > + * NULL. > > + * > > + * It's mandatory to disable interrupts before acquiring the brute_stats::lock > > + * since the task_free hook can be called from an IRQ context during the > > + * execution of the task_fatal_signal hook. > > + * > > + * Context: Must be called with interrupts disabled and brute_stats_ptr_lock > > + * held. > > + * Return: The application crash period. > > + */ > > +static u64 brute_get_crash_period(struct brute_stats *stats) > > +{ > > + u64 crash_period; > > + > > + spin_lock(&stats->lock); > > + crash_period = stats->period; > > + spin_unlock(&stats->lock); > > + > > + return crash_period; > > +} > > return READ_ONCE(stats->period); Ok, thanks. > > + > > +/** > > + * print_exec_attack_running() - Warn about an exec brute force attack. > > + * @stats: Statistical data shared by all the fork hierarchy processes. > > + * > > + * The statistical data shared by all the fork hierarchy processes cannot be > > + * NULL. > > + * > > + * Before showing the process name it is mandatory to find a process that holds > > + * a pointer to the exec statistics. > > + * > > + * Context: Must be called with tasklist_lock and brute_stats_ptr_lock held. > > + */ > > +static void print_exec_attack_running(const struct brute_stats *stats) > > +{ > > + struct task_struct *p; > > + struct brute_stats **p_stats; > > + bool found = false; > > + > > + for_each_process(p) { > > + p_stats = brute_stats_ptr(p); > > + if (*p_stats == stats) { > > + found = true; > > + break; > > + } > > + } > > + > > + if (WARN(!found, "No exec process\n")) > > + return; > > + > > + pr_warn("Exec brute force attack detected [%s]\n", p->comm); > > +} > > Same logic to change here as above for talking the process list. (IIUC, since > you're only reading, you don't need tasklist_lock, just rcu_read_lock.) > But, if I'm reading this right, you only ever call this with "current". > It seems like it would be way more efficient to just use "current" > instead? Ok, I will work on it. Thanks. > > + > > +/** > > + * brute_manage_exec_attack() - Manage an exec brute force attack. > > + * @stats: Statistical data shared by all the fork hierarchy processes. > > + * @now: The current timestamp in jiffies. > > + * @last_fork_crash: The last fork crash timestamp before updating it. > > + * > > + * For a correct management of an exec brute force attack it is only necessary > > + * to update the exec statistics and test if an attack is happening based on > > + * these data. > > + * > > + * It is important to note that if the fork and exec crash periods are the same, > > + * the attack test is avoided. This allows that in a brute force attack that > > + * happens through the fork system call, the mitigation method does not act on > > + * the parent process of the fork hierarchy. > > + * > > + * The statistical data shared by all the fork hierarchy processes cannot be > > + * NULL. > > + * > > + * It's mandatory to disable interrupts before acquiring the brute_stats::lock > > + * since the task_free hook can be called from an IRQ context during the > > + * execution of the task_fatal_signal hook. > > + * > > + * Context: Must be called with interrupts disabled and tasklist_lock and > > + * brute_stats_ptr_lock held. > > + */ > > +static void brute_manage_exec_attack(struct brute_stats *stats, u64 now, > > + u64 last_fork_crash) > > +{ > > + int ret; > > + struct brute_stats *exec_stats = stats; > > + u64 fork_period; > > + u64 exec_period; > > + > > + ret = brute_update_exec_crash_period(&exec_stats, now, last_fork_crash); > > + if (WARN(ret, "No exec statistical data\n")) > > + return; > > I think this should fail closed: if there's a static processing error, > treat it as an attack. Do you mean to trigger the mitigation of a brute force attack over this task? So, IIUC you suggest that instead of generate warnings if there isn't statistical data, we need to trigger the mitigation? This can be applied to the case where the allocation of a brute_stats structure fails? > > + > > + fork_period = brute_get_crash_period(stats); > > + exec_period = brute_get_crash_period(exec_stats); > > + if (fork_period == exec_period) > > + return; > > + > > + if (brute_attack_running(exec_stats)) > > + print_exec_attack_running(exec_stats); > > +} > > + > > I think this is very close! Thank you very much for the comments and guidance. John Wood
On Wed, Mar 17, 2021 at 07:57:10PM -0700, Kees Cook wrote: > On Sun, Mar 07, 2021 at 12:30:26PM +0100, John Wood wrote: > > +static u64 brute_update_crash_period(struct brute_stats *stats, u64 now) > > +{ > > + u64 current_period; > > + u64 last_crash_timestamp; > > + > > + spin_lock(&stats->lock); > > + current_period = now - stats->jiffies; > > + last_crash_timestamp = stats->jiffies; > > + stats->jiffies = now; > > + > > + stats->period -= brute_mul_by_ema_weight(stats->period); > > + stats->period += brute_mul_by_ema_weight(current_period); > > + > > + if (stats->faults < BRUTE_MAX_FAULTS) > > + stats->faults += 1; > > + > > + spin_unlock(&stats->lock); > > + return last_crash_timestamp; > > +} > > Now *here* locking makes sense, and it only needs to be per-stat, not > global, since multiple processes may be operating on the same stat > struct. To make this more no-reader-locking-friendly, I'd also update > everything at the end, and use WRITE_ONCE(): > > u64 current_period, period; > u64 last_crash_timestamp; > u64 faults; > > spin_lock(&stats->lock); > current_period = now - stats->jiffies; > last_crash_timestamp = stats->jiffies; > > WRITE_ONCE(stats->period, > stats->period - brute_mul_by_ema_weight(stats->period) + > brute_mul_by_ema_weight(current_period)); > > if (stats->faults < BRUTE_MAX_FAULTS) > WRITE_ONCE(stats->faults, stats->faults + 1); > > WRITE_ONCE(stats->jiffies, now); > > spin_unlock(&stats->lock); > return last_crash_timestamp; > > That way readers can (IIUC) safely use READ_ONCE() on jiffies and faults > without needing to hold the &stats->lock (unless they need perfectly matching > jiffies, period, and faults). Sorry, but I try to understand how to use locking properly without luck. I have read (and tried to understand): tools/memory-model/Documentation/simple.txt tools/memory-model/Documentation/ordering.txt tools/memory-model/Documentation/recipes.txt Documentation/memory-barriers.txt And I don't find the responses that I need. I'm not saying they aren't there but I don't see them. So my questions: If in the above function makes sense to use locking, and it is called from the brute_task_fatal_signal hook, then, all the functions that are called from this hook need locking (more than one process can access stats at the same time). So, as you point, how it is possible and safe to read jiffies and faults (and I think period even though you not mention it) using READ_ONCE() but without holding brute_stats::lock? I'm very confused. IIUC (during the reading of the documentation) READ_ONCE and WRITE_ONCE only guarantees that a variable loaded with WRITE_ONCE can be read safely with READ_ONCE avoiding tearing, etc. So, I see these functions like a form of guarantee atomicity in variables. Another question. Is it also safe to use WRITE_ONCE without holding the lock? Or this is only appliable to read operations? Any light on this will help me to do the best job in the next patches. If somebody can point me to the right direction it would be greatly appreciated. Is there any documentation for newbies regarding this theme? I'm stuck. I have also read the documentation about spinlocks, semaphores, mutex, etc.. but nothing clears me the concept expose. Apologies if this question has been answered in the past. But the search in the mailing list has not been lucky. Thanks for your time and patience. John Wood
On Sat, Mar 20, 2021 at 04:34:06PM +0100, John Wood wrote: > On Wed, Mar 17, 2021 at 07:57:10PM -0700, Kees Cook wrote: > > On Sun, Mar 07, 2021 at 12:30:26PM +0100, John Wood wrote: > > > @@ -74,7 +84,7 @@ static struct brute_stats *brute_new_stats(void) > > > { > > > struct brute_stats *stats; > > > > > > - stats = kmalloc(sizeof(struct brute_stats), GFP_KERNEL); > > > + stats = kmalloc(sizeof(struct brute_stats), GFP_ATOMIC); > > > > Why change this here? I'd just start with this in the patch that > > introduces it. > > To be coherent in the previous patch. In the previous patch the kmalloc > could use GFP_KERNEL due to the call was made out of an atomic context. > Now, with the new lock it needs GFP_ATOMIC. So the question: > > If finally it need to use GFP_ATOMIC, the first patch need to use it even if > it is not necessary? It's probably not a big deal, but for me, I'd just do GFP_ATOMIC from the start, maybe add a comment that says "some LSM hooks are from atomic context" or something. > > > if (!stats) > > > return NULL; > > > > > > @@ -99,16 +109,17 @@ static struct brute_stats *brute_new_stats(void) > > > * It's mandatory to disable interrupts before acquiring the brute_stats::lock > > > * since the task_free hook can be called from an IRQ context during the > > > * execution of the task_alloc hook. > > > + * > > > + * Context: Must be called with interrupts disabled and brute_stats_ptr_lock > > > + * held. > > > */ > > > static void brute_share_stats(struct brute_stats *src, > > > struct brute_stats **dst) > > > { > > > - unsigned long flags; > > > - > > > - spin_lock_irqsave(&src->lock, flags); > > > + spin_lock(&src->lock); > > > refcount_inc(&src->refc); > > > *dst = src; > > > - spin_unlock_irqrestore(&src->lock, flags); > > > + spin_unlock(&src->lock); > > > } > > > > I still don't think any locking is needed here; the whole function can > > go away, IMO. > > In this case I think this is possible: > > Scenario 1: cpu 1 writes the stats pointer and cpu 2 is navigating the > processes tree reading the same stats pointer. > > Scenario 2: cpu 1 is navigating the processes tree reading the stats > pointer and in IRQ the same stats pointer is wrote. > > So, we need locking. Am I wrong? But only the refcount is being incremented, yes? That doesn't need a lock because it's already an atomic. > > > > /** > > > @@ -126,26 +137,36 @@ static void brute_share_stats(struct brute_stats *src, > > > * this task and the new one being allocated. Otherwise, share the statistics > > > * that the current task already has. > > > * > > > + * It's mandatory to disable interrupts before acquiring brute_stats_ptr_lock > > > + * and brute_stats::lock since the task_free hook can be called from an IRQ > > > + * context during the execution of the task_alloc hook. > > > + * > > > * Return: -ENOMEM if the allocation of the new statistics structure fails. Zero > > > * otherwise. > > > */ > > > static int brute_task_alloc(struct task_struct *task, unsigned long clone_flags) > > > { > > > struct brute_stats **stats, **p_stats; > > > + unsigned long flags; > > > > > > stats = brute_stats_ptr(task); > > > p_stats = brute_stats_ptr(current); > > > + write_lock_irqsave(&brute_stats_ptr_lock, flags); > > > > > > if (likely(*p_stats)) { > > > brute_share_stats(*p_stats, stats); > > > + write_unlock_irqrestore(&brute_stats_ptr_lock, flags); > > > return 0; > > > } > > > > > > *stats = brute_new_stats(); > > > - if (!*stats) > > > + if (!*stats) { > > > + write_unlock_irqrestore(&brute_stats_ptr_lock, flags); > > > return -ENOMEM; > > > + } > > > > > > brute_share_stats(*stats, p_stats); > > > + write_unlock_irqrestore(&brute_stats_ptr_lock, flags); > > > return 0; > > > } > > > > I'd much prefer that whatever locking is needed be introduced in the > > initial patch: this transformation just double the work to review. :) > > So, IIUC I need to introduce all the locks in the initial patch even if > they are not necessary. Am I right? I would find it easier to follow. Perhaps other reviewers would have a different opinion. > > > > > > > @@ -167,9 +188,9 @@ static int brute_task_alloc(struct task_struct *task, unsigned long clone_flags) > > > * only one task (the task that calls the execve function) points to the data. > > > * In this case, the previous allocation is used but the statistics are reset. > > > * > > > - * It's mandatory to disable interrupts before acquiring the brute_stats::lock > > > - * since the task_free hook can be called from an IRQ context during the > > > - * execution of the bprm_committing_creds hook. > > > + * It's mandatory to disable interrupts before acquiring brute_stats_ptr_lock > > > + * and brute_stats::lock since the task_free hook can be called from an IRQ > > > + * context during the execution of the bprm_committing_creds hook. > > > */ > > > static void brute_task_execve(struct linux_binprm *bprm) > > > { > > > @@ -177,24 +198,33 @@ static void brute_task_execve(struct linux_binprm *bprm) > > > unsigned long flags; > > > > > > stats = brute_stats_ptr(current); > > > - if (WARN(!*stats, "No statistical data\n")) > > > + read_lock_irqsave(&brute_stats_ptr_lock, flags); > > > + > > > + if (WARN(!*stats, "No statistical data\n")) { > > > + read_unlock_irqrestore(&brute_stats_ptr_lock, flags); > > > return; > > > + } > > > > > > - spin_lock_irqsave(&(*stats)->lock, flags); > > > + spin_lock(&(*stats)->lock); > > > > > > if (!refcount_dec_not_one(&(*stats)->refc)) { > > > /* execve call after an execve call */ > > > (*stats)->faults = 0; > > > (*stats)->jiffies = get_jiffies_64(); > > > (*stats)->period = 0; > > > - spin_unlock_irqrestore(&(*stats)->lock, flags); > > > + spin_unlock(&(*stats)->lock); > > > + read_unlock_irqrestore(&brute_stats_ptr_lock, flags); > > > return; > > > } > > > > > > /* execve call after a fork call */ > > > - spin_unlock_irqrestore(&(*stats)->lock, flags); > > > + spin_unlock(&(*stats)->lock); > > > + read_unlock_irqrestore(&brute_stats_ptr_lock, flags); > > > + > > > + write_lock_irqsave(&brute_stats_ptr_lock, flags); > > > *stats = brute_new_stats(); > > > WARN(!*stats, "Cannot allocate statistical data\n"); > > > + write_unlock_irqrestore(&brute_stats_ptr_lock, flags); > > > } > > > > Again, I don't see a need for locking -- this is just managing the > > lifetime which is entirely handled by the implicit locking of "current" > > and the refcount_t. > > Here I can see the same two scenarios noted before. So I think the locking > is needed. Am I right? > > > > /** > > > @@ -204,9 +234,9 @@ static void brute_task_execve(struct linux_binprm *bprm) > > > * The statistical data that is shared between all the fork hierarchy processes > > > * needs to be freed when this hierarchy disappears. > > > * > > > - * It's mandatory to disable interrupts before acquiring the brute_stats::lock > > > - * since the task_free hook can be called from an IRQ context during the > > > - * execution of the task_free hook. > > > + * It's mandatory to disable interrupts before acquiring brute_stats_ptr_lock > > > + * and brute_stats::lock since the task_free hook can be called from an IRQ > > > + * context during the execution of the task_free hook. > > > */ > > > static void brute_task_free(struct task_struct *task) > > > { > > > @@ -215,17 +245,446 @@ static void brute_task_free(struct task_struct *task) > > > bool refc_is_zero; > > > > > > stats = brute_stats_ptr(task); > > > - if (WARN(!*stats, "No statistical data\n")) > > > + read_lock_irqsave(&brute_stats_ptr_lock, flags); > > > + > > > + if (WARN(!*stats, "No statistical data\n")) { > > > + read_unlock_irqrestore(&brute_stats_ptr_lock, flags); > > > return; > > > + } > > > > > > - spin_lock_irqsave(&(*stats)->lock, flags); > > > + spin_lock(&(*stats)->lock); > > > refc_is_zero = refcount_dec_and_test(&(*stats)->refc); > > > - spin_unlock_irqrestore(&(*stats)->lock, flags); > > > + spin_unlock(&(*stats)->lock); > > > + read_unlock_irqrestore(&brute_stats_ptr_lock, flags); > > > > > > if (refc_is_zero) { > > > + write_lock_irqsave(&brute_stats_ptr_lock, flags); > > > kfree(*stats); > > > *stats = NULL; > > > + write_unlock_irqrestore(&brute_stats_ptr_lock, flags); > > > + } > > > +} > > > > Same; I would expect this to be simply: > > No comment. I think I am missing something. I need to clarify the previous > cases before to work on the next ones. Sorry and thanks for the guidance. Right -- so, there are a few concurrency cases you need to worry about, AIUI: 1- stats lifetime (based on creation/death of tasks) 2- stats value being written vs read 3- stats values being written/read vs stats lifetime Using refcount_t in the standard pattern (as you're doing) should entirely cover "1". Since the values read from stats are mostly independent, it should be possible to use READ_ONCE() in the readers and WRITE_ONCE() under a lock in the writers (this is case "2"). For "3", I think the implicit locking of "current" keeps you safe (as in, the stats can't go away because "current" will always have a reference on it). I see two places where stats are written. One appears to be the brute_task_execve() case where only 1 thread exists, so there's no lock needed, and the other case is brute_update_crash_period(), which makes sense to me to lock: two tasks might be sharing a stats as they crash. Of course, I could easily be missing something here, but it looks like much less locking is needed. > > > stats = brute_stats_ptr(task); > > if (WARN_ON_ONCE(!*stats)) > > return; > > if (refcount_dec_and_test(&(*stats)->refc)) { > > kfree(*stats); > > *stats = NULL; > > } > > > > > + > > > +/* > > > + * BRUTE_EMA_WEIGHT_NUMERATOR - Weight's numerator of EMA. > > > + */ > > > +static const u64 BRUTE_EMA_WEIGHT_NUMERATOR = 7; > > > + > > > +/* > > > + * BRUTE_EMA_WEIGHT_DENOMINATOR - Weight's denominator of EMA. > > > + */ > > > +static const u64 BRUTE_EMA_WEIGHT_DENOMINATOR = 10; > > > > Should these be externally configurable (via sysfs)? > > No problem. I think this is easier than locking :) Heh, for the most part, yes. ;) Though I have my own nightmares[1] about sysfs. > > > +/** > > > + * brute_update_crash_period() - Update the application crash period. > > > + * @stats: Statistics that hold the application crash period to update. > > > + * @now: The current timestamp in jiffies. > > > + * > > > + * The application crash period must be a value that is not prone to change due > > > + * to spurious data and follows the real crash period. So, to compute it, the > > > + * exponential moving average (EMA) is used. > > > + * > > > + * This kind of average defines a weight (between 0 and 1) for the new value to > > > + * add and applies the remainder of the weight to the current average value. > > > + * This way, some spurious data will not excessively modify the average and only > > > + * if the new values are persistent, the moving average will tend towards them. > > > + * > > > + * Mathematically the application crash period's EMA can be expressed as > > > + * follows: > > > + * > > > + * period_ema = period * weight + period_ema * (1 - weight) > > > + * > > > + * If the operations are applied: > > > + * > > > + * period_ema = period * weight + period_ema - period_ema * weight > > > + * > > > + * If the operands are ordered: > > > + * > > > + * period_ema = period_ema - period_ema * weight + period * weight > > > + * > > > + * Finally, this formula can be written as follows: > > > + * > > > + * period_ema -= period_ema * weight; > > > + * period_ema += period * weight; > > > + * > > > + * The statistics that hold the application crash period to update cannot be > > > + * NULL. > > > + * > > > + * It's mandatory to disable interrupts before acquiring the brute_stats::lock > > > + * since the task_free hook can be called from an IRQ context during the > > > + * execution of the task_fatal_signal hook. > > > + * > > > + * Context: Must be called with interrupts disabled and brute_stats_ptr_lock > > > + * held. > > > + * Return: The last crash timestamp before updating it. > > > + */ > > > +static u64 brute_update_crash_period(struct brute_stats *stats, u64 now) > > > +{ > > > + u64 current_period; > > > + u64 last_crash_timestamp; > > > + > > > + spin_lock(&stats->lock); > > > + current_period = now - stats->jiffies; > > > + last_crash_timestamp = stats->jiffies; > > > + stats->jiffies = now; > > > + > > > + stats->period -= brute_mul_by_ema_weight(stats->period); > > > + stats->period += brute_mul_by_ema_weight(current_period); > > > + > > > + if (stats->faults < BRUTE_MAX_FAULTS) > > > + stats->faults += 1; > > > + > > > + spin_unlock(&stats->lock); > > > + return last_crash_timestamp; > > > +} > > > > Now *here* locking makes sense, and it only needs to be per-stat, not > > global, since multiple processes may be operating on the same stat > > struct. To make this more no-reader-locking-friendly, I'd also update > > everything at the end, and use WRITE_ONCE(): > > > > u64 current_period, period; > > u64 last_crash_timestamp; > > u64 faults; > > > > spin_lock(&stats->lock); > > current_period = now - stats->jiffies; > > last_crash_timestamp = stats->jiffies; > > > > WRITE_ONCE(stats->period, > > stats->period - brute_mul_by_ema_weight(stats->period) + > > brute_mul_by_ema_weight(current_period)); > > > > if (stats->faults < BRUTE_MAX_FAULTS) > > WRITE_ONCE(stats->faults, stats->faults + 1); > > > > WRITE_ONCE(stats->jiffies, now); > > > > spin_unlock(&stats->lock); > > return last_crash_timestamp; > > > > That way readers can (IIUC) safely use READ_ONCE() on jiffies and faults > > without needing to hold the &stats->lock (unless they need perfectly matching > > jiffies, period, and faults). > > Thanks for the refactory. I will work on it (if I can understand locking). :( It may be worth reading Documentation/memory-barriers.txt which has some more details. > > > +/** > > > + * brute_manage_fork_attack() - Manage a fork brute force attack. > > > + * @stats: Statistical data shared by all the fork hierarchy processes. > > > + * @now: The current timestamp in jiffies. > > > + * > > > + * For a correct management of a fork brute force attack it is only necessary to > > > + * update the statistics and test if an attack is happening based on these data. > > > + * > > > + * The statistical data shared by all the fork hierarchy processes cannot be > > > + * NULL. > > > + * > > > + * It's mandatory to disable interrupts before acquiring the brute_stats::lock > > > + * since the task_free hook can be called from an IRQ context during the > > > + * execution of the task_fatal_signal hook. > > > + * > > > + * Context: Must be called with interrupts disabled and brute_stats_ptr_lock > > > + * held. > > > + * Return: The last crash timestamp before updating it. > > > + */ > > > +static u64 brute_manage_fork_attack(struct brute_stats *stats, u64 now) > > > +{ > > > + u64 last_fork_crash; > > > + > > > + last_fork_crash = brute_update_crash_period(stats, now); > > > + if (brute_attack_running(stats)) > > > + print_fork_attack_running(); > > > + > > > + return last_fork_crash; > > > +} > > > + > > > +/** > > > + * brute_get_exec_stats() - Get the exec statistics. > > > + * @stats: When this function is called, this parameter must point to the > > > + * current process' statistical data. When this function returns, this > > > + * parameter points to the parent process' statistics of the fork > > > + * hierarchy that hold the current process' statistics. > > > + * > > > + * To manage a brute force attack that happens through the execve system call it > > > + * is not possible to use the statistical data hold by this process due to these > > > + * statistics disappear when this task is finished. In this scenario this data > > > + * should be tracked by the statistics of a higher fork hierarchy (the hierarchy > > > + * that contains the process that forks before the execve system call). > > > + * > > > + * To find these statistics the current fork hierarchy must be traversed up > > > + * until new statistics are found. > > > + * > > > + * Context: Must be called with tasklist_lock and brute_stats_ptr_lock held. > > > + */ > > > +static void brute_get_exec_stats(struct brute_stats **stats) > > > +{ > > > + const struct task_struct *task = current; > > > + struct brute_stats **p_stats; > > > + > > > + do { > > > + if (!task->real_parent) { > > > + *stats = NULL; > > > + return; > > > + } > > > + > > > + p_stats = brute_stats_ptr(task->real_parent); > > > + task = task->real_parent; > > > + } while (*stats == *p_stats); > > > + > > > + *stats = *p_stats; > > > +} > > > > See Yama's task_is_descendant() for how to walk up the process tree > > (and I think the process group stuff will save some steps too); you > > don't need tasklist_lock held, just rcu_read_lock held, AIUI: > > Documentation/RCU/listRCU.rst > > > > And since you're passing this stats struct back up, and it would be outside of rcu read lock, you'd want to do a "get" on it first: > > > > rcu_read_lock(); > > loop { > > ... > > } > > refcount_inc_not_zero(&(*p_stats)->refc); > > rcu_read_unlock(); > > > > *stats = *p_stats > > Thanks for the suggestions. I will work on it for the next version. > Anyway, in the first version Kees Cook and Jann Horn noted that some tasks > could escape the rcu read lock and that alternate locking were needed. > > Extract from the RFC: > > [Kees Cook] > Can't newly created processes escape this RCU read lock? I think this > need alternate locking, or something in the task_alloc hook that will > block any new process from being created within the stats group. > > [Jann Horn] > Good point; the proper way to deal with this would probably be to take > the tasklist_lock in read mode around this loop (with > read_lock(&tasklist_lock) / read_unlock(&tasklist_lock)), which pairs > with the write_lock_irq(&tasklist_lock) in copy_process(). Thanks to > the fatal_signal_pending() check while holding the lock in > copy_process(), that would be race-free - any fork() that has not yet > inserted the new task into the global task list would wait for us to > drop the tasklist_lock, then bail out at the fatal_signal_pending() > check. > > I think that this scenario is still possible. So the tasklist_lock is > necessary. Am I right? Oops, yeah, best to listen to Jann and past-me. :) Were these comments about finding the parent or killing offenders? > > > + > > > + spin_lock(&(*stats)->lock); > > > + if (!(*stats)->faults) > > > + (*stats)->jiffies = last_fork_crash; > > > + spin_unlock(&(*stats)->lock); > > > + > > > + brute_update_crash_period(*stats, now); > > > > and then you can add: > > > > if (refcount_dec_and_test(&(*stats)->refc)) > > kfree(*stats); > > > > (or better yet, make that a helper) named something like > > "put_brute_stats". > > Sorry, but I don't understand why we need to free the stats here. > What is the rationale behind this change? Err, I think I may have quoted the wrong chunk of your patch! Sorry; I was talking about the place where you did a free, I think? Disregard this for now. :) > > > +/** > > > + * brute_manage_exec_attack() - Manage an exec brute force attack. > > > + * @stats: Statistical data shared by all the fork hierarchy processes. > > > + * @now: The current timestamp in jiffies. > > > + * @last_fork_crash: The last fork crash timestamp before updating it. > > > + * > > > + * For a correct management of an exec brute force attack it is only necessary > > > + * to update the exec statistics and test if an attack is happening based on > > > + * these data. > > > + * > > > + * It is important to note that if the fork and exec crash periods are the same, > > > + * the attack test is avoided. This allows that in a brute force attack that > > > + * happens through the fork system call, the mitigation method does not act on > > > + * the parent process of the fork hierarchy. > > > + * > > > + * The statistical data shared by all the fork hierarchy processes cannot be > > > + * NULL. > > > + * > > > + * It's mandatory to disable interrupts before acquiring the brute_stats::lock > > > + * since the task_free hook can be called from an IRQ context during the > > > + * execution of the task_fatal_signal hook. > > > + * > > > + * Context: Must be called with interrupts disabled and tasklist_lock and > > > + * brute_stats_ptr_lock held. > > > + */ > > > +static void brute_manage_exec_attack(struct brute_stats *stats, u64 now, > > > + u64 last_fork_crash) > > > +{ > > > + int ret; > > > + struct brute_stats *exec_stats = stats; > > > + u64 fork_period; > > > + u64 exec_period; > > > + > > > + ret = brute_update_exec_crash_period(&exec_stats, now, last_fork_crash); > > > + if (WARN(ret, "No exec statistical data\n")) > > > + return; > > > > I think this should fail closed: if there's a static processing error, > > treat it as an attack. > > Do you mean to trigger the mitigation of a brute force attack over this task? > So, IIUC you suggest that instead of generate warnings if there isn't > statistical data, we need to trigger the mitigation? This can be applied to > the case where the allocation of a brute_stats structure fails? Right -- it should be an impossible scenario that the stats are _missing_. There is not an expected execution path in the kernel where that could happen, so if you're testing for it (and correctly generating a WARN), it should _also_ fail closed: an impossible case has been found, so assume userspace is under attack. (Otherwise it could serve as a bypass for an attacker who has found a way to navigate a process into this state.) -Kees
On Sun, Mar 21, 2021 at 04:01:18PM +0100, John Wood wrote: > On Wed, Mar 17, 2021 at 07:57:10PM -0700, Kees Cook wrote: > > On Sun, Mar 07, 2021 at 12:30:26PM +0100, John Wood wrote: > > > +static u64 brute_update_crash_period(struct brute_stats *stats, u64 now) > > > +{ > > > + u64 current_period; > > > + u64 last_crash_timestamp; > > > + > > > + spin_lock(&stats->lock); > > > + current_period = now - stats->jiffies; > > > + last_crash_timestamp = stats->jiffies; > > > + stats->jiffies = now; > > > + > > > + stats->period -= brute_mul_by_ema_weight(stats->period); > > > + stats->period += brute_mul_by_ema_weight(current_period); > > > + > > > + if (stats->faults < BRUTE_MAX_FAULTS) > > > + stats->faults += 1; > > > + > > > + spin_unlock(&stats->lock); > > > + return last_crash_timestamp; > > > +} > > > > Now *here* locking makes sense, and it only needs to be per-stat, not > > global, since multiple processes may be operating on the same stat > > struct. To make this more no-reader-locking-friendly, I'd also update > > everything at the end, and use WRITE_ONCE(): > > > > u64 current_period, period; > > u64 last_crash_timestamp; > > u64 faults; > > > > spin_lock(&stats->lock); > > current_period = now - stats->jiffies; > > last_crash_timestamp = stats->jiffies; > > > > WRITE_ONCE(stats->period, > > stats->period - brute_mul_by_ema_weight(stats->period) + > > brute_mul_by_ema_weight(current_period)); > > > > if (stats->faults < BRUTE_MAX_FAULTS) > > WRITE_ONCE(stats->faults, stats->faults + 1); > > > > WRITE_ONCE(stats->jiffies, now); > > > > spin_unlock(&stats->lock); > > return last_crash_timestamp; > > > > That way readers can (IIUC) safely use READ_ONCE() on jiffies and faults > > without needing to hold the &stats->lock (unless they need perfectly matching > > jiffies, period, and faults). > > Sorry, but I try to understand how to use locking properly without luck. > > I have read (and tried to understand): > tools/memory-model/Documentation/simple.txt > tools/memory-model/Documentation/ordering.txt > tools/memory-model/Documentation/recipes.txt > Documentation/memory-barriers.txt > > And I don't find the responses that I need. I'm not saying they aren't > there but I don't see them. So my questions: > > If in the above function makes sense to use locking, and it is called from > the brute_task_fatal_signal hook, then, all the functions that are called > from this hook need locking (more than one process can access stats at the > same time). > > So, as you point, how it is possible and safe to read jiffies and faults > (and I think period even though you not mention it) using READ_ONCE() but > without holding brute_stats::lock? I'm very confused. There are, I think, 3 considerations: - is "stats", itself, a valid allocation in kernel memory? This is the "lifetime" management of the structure: it will only stay allocated as long as there is a task still alive that is attached to it. The use of refcount_t on task creation/death should entirely solve this issue, so that all the other places where you access "stats", the memory will be valid. AFAICT, this one is fine: you're doing all the correct lifetime management. - changing a task's stats pointer: this is related to lifetime management, but it, I think, entirely solved by the existing refcounting. (And isn't helped by holding stats->lock since this is about stats itself being a valid pointer.) Again, I think this is all correct already in your existing code (due to the implicit locking of "current"). Perhaps I've missed something here, but I guess we'll see! - are the values in stats getting written by multiple writers, or read during a write, etc? This last one is the core of what I think could be improved here: To keep the writes serialized, you (correctly) perform locking in the writers. This is fine. There is also locking in the readers, which I think is not needed. AFAICT, READ_ONCE() (with WRITE_ONCE() in the writers) is sufficient for the readers here. > IIUC (during the reading of the documentation) READ_ONCE and WRITE_ONCE only > guarantees that a variable loaded with WRITE_ONCE can be read safely with > READ_ONCE avoiding tearing, etc. So, I see these functions like a form of > guarantee atomicity in variables. Right -- from what I can see about how you're reading the statistics, I don't see a way to have the values get confused (assuming locked writes and READ/WRITE_ONCE()). > Another question. Is it also safe to use WRITE_ONCE without holding the lock? > Or this is only appliable to read operations? No -- you'll still want the writer locked since you update multiple fields in stats during a write, so you could miss increments, or interleave count vs jiffies writes, etc. But the WRITE_ONCE() makes sure that the READ_ONCE() readers will see a stable value (as I understand it), and in the order they were written. > Any light on this will help me to do the best job in the next patches. If > somebody can point me to the right direction it would be greatly appreciated. > > Is there any documentation for newbies regarding this theme? I'm stuck. > I have also read the documentation about spinlocks, semaphores, mutex, etc.. > but nothing clears me the concept expose. > > Apologies if this question has been answered in the past. But the search in > the mailing list has not been lucky. It's a complex subject! Here are some other docs that might help: tools/memory-model/Documentation/explanation.txt Documentation/core-api/refcount-vs-atomic.rst or they may melt your brain further! :) I know mine is always mushy after reading them. > Thanks for your time and patience. You're welcome; and thank you for your work on this! I've wanted a robust brute force mitigation in the kernel for a long time. :) -Kees
Hi, On Sun, Mar 21, 2021 at 11:45:59AM -0700, Kees Cook wrote: > On Sun, Mar 21, 2021 at 04:01:18PM +0100, John Wood wrote: > > On Wed, Mar 17, 2021 at 07:57:10PM -0700, Kees Cook wrote: > > > On Sun, Mar 07, 2021 at 12:30:26PM +0100, John Wood wrote: > > Sorry, but I try to understand how to use locking properly without luck. > > > > I have read (and tried to understand): > > tools/memory-model/Documentation/simple.txt > > tools/memory-model/Documentation/ordering.txt > > tools/memory-model/Documentation/recipes.txt > > Documentation/memory-barriers.txt > > > > And I don't find the responses that I need. I'm not saying they aren't > > there but I don't see them. So my questions: > > > > If in the above function makes sense to use locking, and it is called from > > the brute_task_fatal_signal hook, then, all the functions that are called > > from this hook need locking (more than one process can access stats at the > > same time). > > > > So, as you point, how it is possible and safe to read jiffies and faults > > (and I think period even though you not mention it) using READ_ONCE() but > > without holding brute_stats::lock? I'm very confused. > > There are, I think, 3 considerations: > > - is "stats", itself, a valid allocation in kernel memory? This is the > "lifetime" management of the structure: it will only stay allocated as > long as there is a task still alive that is attached to it. The use of > refcount_t on task creation/death should entirely solve this issue, so > that all the other places where you access "stats", the memory will be > valid. AFAICT, this one is fine: you're doing all the correct lifetime > management. > > - changing a task's stats pointer: this is related to lifetime > management, but it, I think, entirely solved by the existing > refcounting. (And isn't helped by holding stats->lock since this is > about stats itself being a valid pointer.) Again, I think this is all > correct already in your existing code (due to the implicit locking of > "current"). Perhaps I've missed something here, but I guess we'll see! My only concern now is the following case: One process crashes with a fatal signal. Then, its stats are updated. Then we get the exec stats (the stats of the task that calls exec). At the same time another CPU frees this same stats. Now, if the first process writes to the exec stats we get a "use after free" bug. If this scenario is possible, we would need to protect all the section inside the task_fatal_signal hook that deals with the exec stats. I think that here a global lock is necessary and also, protect the write of the pointer to stats struct in the task_free hook. Moreover, I can see another scenario: The first CPU gets the exec stats when a task fails with a fatal signal. The second CPU exec()ve after exec()ve over the same task from we get the exec stats with the first CPU. This second CPU resets the stats at the same time that the first CPU updates the same stats. I think we also need lock here. Am I right? Are these paths possible? > > - are the values in stats getting written by multiple writers, or read > during a write, etc? > > This last one is the core of what I think could be improved here: > > To keep the writes serialized, you (correctly) perform locking in the > writers. This is fine. > > There is also locking in the readers, which I think is not needed. > AFAICT, READ_ONCE() (with WRITE_ONCE() in the writers) is sufficient for > the readers here. > > > IIUC (during the reading of the documentation) READ_ONCE and WRITE_ONCE only > > guarantees that a variable loaded with WRITE_ONCE can be read safely with > > READ_ONCE avoiding tearing, etc. So, I see these functions like a form of > > guarantee atomicity in variables. > > Right -- from what I can see about how you're reading the statistics, I > don't see a way to have the values get confused (assuming locked writes > and READ/WRITE_ONCE()). > > > Another question. Is it also safe to use WRITE_ONCE without holding the lock? > > Or this is only appliable to read operations? > > No -- you'll still want the writer locked since you update multiple fields > in stats during a write, so you could miss increments, or interleave > count vs jiffies writes, etc. But the WRITE_ONCE() makes sure that the > READ_ONCE() readers will see a stable value (as I understand it), and > in the order they were written. > > > Any light on this will help me to do the best job in the next patches. If > > somebody can point me to the right direction it would be greatly appreciated. > > > > Is there any documentation for newbies regarding this theme? I'm stuck. > > I have also read the documentation about spinlocks, semaphores, mutex, etc.. > > but nothing clears me the concept expose. > > > > Apologies if this question has been answered in the past. But the search in > > the mailing list has not been lucky. > > It's a complex subject! Here are some other docs that might help: > > tools/memory-model/Documentation/explanation.txt > Documentation/core-api/refcount-vs-atomic.rst > > or they may melt your brain further! :) I know mine is always mushy > after reading them. > > > Thanks for your time and patience. > > You're welcome; and thank you for your work on this! I've wanted a robust > brute force mitigation in the kernel for a long time. :) > Thank you very much for this great explanation and mentorship. Now this subject is more clear to me. It's a pleasure to me to work on this. Again, thanks for your help. John Wood
diff --git a/security/brute/brute.c b/security/brute/brute.c index 99d099e45112..870db55332d4 100644 --- a/security/brute/brute.c +++ b/security/brute/brute.c @@ -11,9 +11,14 @@ #include <linux/jiffies.h> #include <linux/kernel.h> #include <linux/lsm_hooks.h> +#include <linux/math64.h> #include <linux/printk.h> #include <linux/refcount.h> +#include <linux/rwlock.h> +#include <linux/rwlock_types.h> #include <linux/sched.h> +#include <linux/sched/signal.h> +#include <linux/sched/task.h> #include <linux/slab.h> #include <linux/spinlock.h> #include <linux/types.h> @@ -37,6 +42,11 @@ struct brute_stats { u64 period; }; +/* + * brute_stats_ptr_lock - Lock to protect the brute_stats structure pointer. + */ +static DEFINE_RWLOCK(brute_stats_ptr_lock); + /* * brute_blob_sizes - LSM blob sizes. * @@ -74,7 +84,7 @@ static struct brute_stats *brute_new_stats(void) { struct brute_stats *stats; - stats = kmalloc(sizeof(struct brute_stats), GFP_KERNEL); + stats = kmalloc(sizeof(struct brute_stats), GFP_ATOMIC); if (!stats) return NULL; @@ -99,16 +109,17 @@ static struct brute_stats *brute_new_stats(void) * It's mandatory to disable interrupts before acquiring the brute_stats::lock * since the task_free hook can be called from an IRQ context during the * execution of the task_alloc hook. + * + * Context: Must be called with interrupts disabled and brute_stats_ptr_lock + * held. */ static void brute_share_stats(struct brute_stats *src, struct brute_stats **dst) { - unsigned long flags; - - spin_lock_irqsave(&src->lock, flags); + spin_lock(&src->lock); refcount_inc(&src->refc); *dst = src; - spin_unlock_irqrestore(&src->lock, flags); + spin_unlock(&src->lock); } /** @@ -126,26 +137,36 @@ static void brute_share_stats(struct brute_stats *src, * this task and the new one being allocated. Otherwise, share the statistics * that the current task already has. * + * It's mandatory to disable interrupts before acquiring brute_stats_ptr_lock + * and brute_stats::lock since the task_free hook can be called from an IRQ + * context during the execution of the task_alloc hook. + * * Return: -ENOMEM if the allocation of the new statistics structure fails. Zero * otherwise. */ static int brute_task_alloc(struct task_struct *task, unsigned long clone_flags) { struct brute_stats **stats, **p_stats; + unsigned long flags; stats = brute_stats_ptr(task); p_stats = brute_stats_ptr(current); + write_lock_irqsave(&brute_stats_ptr_lock, flags); if (likely(*p_stats)) { brute_share_stats(*p_stats, stats); + write_unlock_irqrestore(&brute_stats_ptr_lock, flags); return 0; } *stats = brute_new_stats(); - if (!*stats) + if (!*stats) { + write_unlock_irqrestore(&brute_stats_ptr_lock, flags); return -ENOMEM; + } brute_share_stats(*stats, p_stats); + write_unlock_irqrestore(&brute_stats_ptr_lock, flags); return 0; } @@ -167,9 +188,9 @@ static int brute_task_alloc(struct task_struct *task, unsigned long clone_flags) * only one task (the task that calls the execve function) points to the data. * In this case, the previous allocation is used but the statistics are reset. * - * It's mandatory to disable interrupts before acquiring the brute_stats::lock - * since the task_free hook can be called from an IRQ context during the - * execution of the bprm_committing_creds hook. + * It's mandatory to disable interrupts before acquiring brute_stats_ptr_lock + * and brute_stats::lock since the task_free hook can be called from an IRQ + * context during the execution of the bprm_committing_creds hook. */ static void brute_task_execve(struct linux_binprm *bprm) { @@ -177,24 +198,33 @@ static void brute_task_execve(struct linux_binprm *bprm) unsigned long flags; stats = brute_stats_ptr(current); - if (WARN(!*stats, "No statistical data\n")) + read_lock_irqsave(&brute_stats_ptr_lock, flags); + + if (WARN(!*stats, "No statistical data\n")) { + read_unlock_irqrestore(&brute_stats_ptr_lock, flags); return; + } - spin_lock_irqsave(&(*stats)->lock, flags); + spin_lock(&(*stats)->lock); if (!refcount_dec_not_one(&(*stats)->refc)) { /* execve call after an execve call */ (*stats)->faults = 0; (*stats)->jiffies = get_jiffies_64(); (*stats)->period = 0; - spin_unlock_irqrestore(&(*stats)->lock, flags); + spin_unlock(&(*stats)->lock); + read_unlock_irqrestore(&brute_stats_ptr_lock, flags); return; } /* execve call after a fork call */ - spin_unlock_irqrestore(&(*stats)->lock, flags); + spin_unlock(&(*stats)->lock); + read_unlock_irqrestore(&brute_stats_ptr_lock, flags); + + write_lock_irqsave(&brute_stats_ptr_lock, flags); *stats = brute_new_stats(); WARN(!*stats, "Cannot allocate statistical data\n"); + write_unlock_irqrestore(&brute_stats_ptr_lock, flags); } /** @@ -204,9 +234,9 @@ static void brute_task_execve(struct linux_binprm *bprm) * The statistical data that is shared between all the fork hierarchy processes * needs to be freed when this hierarchy disappears. * - * It's mandatory to disable interrupts before acquiring the brute_stats::lock - * since the task_free hook can be called from an IRQ context during the - * execution of the task_free hook. + * It's mandatory to disable interrupts before acquiring brute_stats_ptr_lock + * and brute_stats::lock since the task_free hook can be called from an IRQ + * context during the execution of the task_free hook. */ static void brute_task_free(struct task_struct *task) { @@ -215,17 +245,446 @@ static void brute_task_free(struct task_struct *task) bool refc_is_zero; stats = brute_stats_ptr(task); - if (WARN(!*stats, "No statistical data\n")) + read_lock_irqsave(&brute_stats_ptr_lock, flags); + + if (WARN(!*stats, "No statistical data\n")) { + read_unlock_irqrestore(&brute_stats_ptr_lock, flags); return; + } - spin_lock_irqsave(&(*stats)->lock, flags); + spin_lock(&(*stats)->lock); refc_is_zero = refcount_dec_and_test(&(*stats)->refc); - spin_unlock_irqrestore(&(*stats)->lock, flags); + spin_unlock(&(*stats)->lock); + read_unlock_irqrestore(&brute_stats_ptr_lock, flags); if (refc_is_zero) { + write_lock_irqsave(&brute_stats_ptr_lock, flags); kfree(*stats); *stats = NULL; + write_unlock_irqrestore(&brute_stats_ptr_lock, flags); + } +} + +/* + * BRUTE_EMA_WEIGHT_NUMERATOR - Weight's numerator of EMA. + */ +static const u64 BRUTE_EMA_WEIGHT_NUMERATOR = 7; + +/* + * BRUTE_EMA_WEIGHT_DENOMINATOR - Weight's denominator of EMA. + */ +static const u64 BRUTE_EMA_WEIGHT_DENOMINATOR = 10; + +/** + * brute_mul_by_ema_weight() - Multiply by EMA weight. + * @value: Value to multiply by EMA weight. + * + * Return: The result of the multiplication operation. + */ +static inline u64 brute_mul_by_ema_weight(u64 value) +{ + return mul_u64_u64_div_u64(value, BRUTE_EMA_WEIGHT_NUMERATOR, + BRUTE_EMA_WEIGHT_DENOMINATOR); +} + +/* + * BRUTE_MAX_FAULTS - Maximum number of faults. + * + * If a brute force attack is running slowly for a long time, the application + * crash period's EMA is not suitable for the detection. This type of attack + * must be detected using a maximum number of faults. + */ +static const unsigned char BRUTE_MAX_FAULTS = 200; + +/** + * brute_update_crash_period() - Update the application crash period. + * @stats: Statistics that hold the application crash period to update. + * @now: The current timestamp in jiffies. + * + * The application crash period must be a value that is not prone to change due + * to spurious data and follows the real crash period. So, to compute it, the + * exponential moving average (EMA) is used. + * + * This kind of average defines a weight (between 0 and 1) for the new value to + * add and applies the remainder of the weight to the current average value. + * This way, some spurious data will not excessively modify the average and only + * if the new values are persistent, the moving average will tend towards them. + * + * Mathematically the application crash period's EMA can be expressed as + * follows: + * + * period_ema = period * weight + period_ema * (1 - weight) + * + * If the operations are applied: + * + * period_ema = period * weight + period_ema - period_ema * weight + * + * If the operands are ordered: + * + * period_ema = period_ema - period_ema * weight + period * weight + * + * Finally, this formula can be written as follows: + * + * period_ema -= period_ema * weight; + * period_ema += period * weight; + * + * The statistics that hold the application crash period to update cannot be + * NULL. + * + * It's mandatory to disable interrupts before acquiring the brute_stats::lock + * since the task_free hook can be called from an IRQ context during the + * execution of the task_fatal_signal hook. + * + * Context: Must be called with interrupts disabled and brute_stats_ptr_lock + * held. + * Return: The last crash timestamp before updating it. + */ +static u64 brute_update_crash_period(struct brute_stats *stats, u64 now) +{ + u64 current_period; + u64 last_crash_timestamp; + + spin_lock(&stats->lock); + current_period = now - stats->jiffies; + last_crash_timestamp = stats->jiffies; + stats->jiffies = now; + + stats->period -= brute_mul_by_ema_weight(stats->period); + stats->period += brute_mul_by_ema_weight(current_period); + + if (stats->faults < BRUTE_MAX_FAULTS) + stats->faults += 1; + + spin_unlock(&stats->lock); + return last_crash_timestamp; +} + +/* + * BRUTE_MIN_FAULTS - Minimum number of faults. + * + * The application crash period's EMA cannot be used until a minimum number of + * data has been applied to it. This constraint allows getting a trend when this + * moving average is used. Moreover, it avoids the scenario where an application + * fails quickly from execve system call due to reasons unrelated to a real + * attack. + */ +static const unsigned char BRUTE_MIN_FAULTS = 5; + +/* + * BRUTE_CRASH_PERIOD_THRESHOLD - Application crash period threshold. + * + * The units are expressed in milliseconds. + * + * A fast brute force attack is detected when the application crash period falls + * below this threshold. + */ +static const u64 BRUTE_CRASH_PERIOD_THRESHOLD = 30000; + +/** + * brute_attack_running() - Test if a brute force attack is happening. + * @stats: Statistical data shared by all the fork hierarchy processes. + * + * The decision if a brute force attack is running is based on the statistical + * data shared by all the fork hierarchy processes. This statistics cannot be + * NULL. + * + * There are two types of brute force attacks that can be detected using the + * statistical data. The first one is a slow brute force attack that is detected + * if the maximum number of faults per fork hierarchy is reached. The second + * type is a fast brute force attack that is detected if the application crash + * period falls below a certain threshold. + * + * Moreover, it is important to note that no attacks will be detected until a + * minimum number of faults have occurred. This allows to have a trend in the + * crash period when the EMA is used and also avoids the scenario where an + * application fails quickly from execve system call due to reasons unrelated to + * a real attack. + * + * It's mandatory to disable interrupts before acquiring the brute_stats::lock + * since the task_free hook can be called from an IRQ context during the + * execution of the task_fatal_signal hook. + * + * Context: Must be called with interrupts disabled and brute_stats_ptr_lock + * held. + * Return: True if a brute force attack is happening. False otherwise. + */ +static bool brute_attack_running(struct brute_stats *stats) +{ + u64 crash_period; + + spin_lock(&stats->lock); + if (stats->faults < BRUTE_MIN_FAULTS) { + spin_unlock(&stats->lock); + return false; + } + + if (stats->faults >= BRUTE_MAX_FAULTS) { + spin_unlock(&stats->lock); + return true; + } + + crash_period = jiffies64_to_msecs(stats->period); + spin_unlock(&stats->lock); + + return crash_period < BRUTE_CRASH_PERIOD_THRESHOLD; +} + +/** + * print_fork_attack_running() - Warn about a fork brute force attack. + */ +static inline void print_fork_attack_running(void) +{ + pr_warn("Fork brute force attack detected [%s]\n", current->comm); +} + +/** + * brute_manage_fork_attack() - Manage a fork brute force attack. + * @stats: Statistical data shared by all the fork hierarchy processes. + * @now: The current timestamp in jiffies. + * + * For a correct management of a fork brute force attack it is only necessary to + * update the statistics and test if an attack is happening based on these data. + * + * The statistical data shared by all the fork hierarchy processes cannot be + * NULL. + * + * It's mandatory to disable interrupts before acquiring the brute_stats::lock + * since the task_free hook can be called from an IRQ context during the + * execution of the task_fatal_signal hook. + * + * Context: Must be called with interrupts disabled and brute_stats_ptr_lock + * held. + * Return: The last crash timestamp before updating it. + */ +static u64 brute_manage_fork_attack(struct brute_stats *stats, u64 now) +{ + u64 last_fork_crash; + + last_fork_crash = brute_update_crash_period(stats, now); + if (brute_attack_running(stats)) + print_fork_attack_running(); + + return last_fork_crash; +} + +/** + * brute_get_exec_stats() - Get the exec statistics. + * @stats: When this function is called, this parameter must point to the + * current process' statistical data. When this function returns, this + * parameter points to the parent process' statistics of the fork + * hierarchy that hold the current process' statistics. + * + * To manage a brute force attack that happens through the execve system call it + * is not possible to use the statistical data hold by this process due to these + * statistics disappear when this task is finished. In this scenario this data + * should be tracked by the statistics of a higher fork hierarchy (the hierarchy + * that contains the process that forks before the execve system call). + * + * To find these statistics the current fork hierarchy must be traversed up + * until new statistics are found. + * + * Context: Must be called with tasklist_lock and brute_stats_ptr_lock held. + */ +static void brute_get_exec_stats(struct brute_stats **stats) +{ + const struct task_struct *task = current; + struct brute_stats **p_stats; + + do { + if (!task->real_parent) { + *stats = NULL; + return; + } + + p_stats = brute_stats_ptr(task->real_parent); + task = task->real_parent; + } while (*stats == *p_stats); + + *stats = *p_stats; +} + +/** + * brute_update_exec_crash_period() - Update the exec crash period. + * @stats: When this function is called, this parameter must point to the + * current process' statistical data. When this function returns, this + * parameter points to the updated statistics (statistics that track the + * info to manage a brute force attack that happens through the execve + * system call). + * @now: The current timestamp in jiffies. + * @last_fork_crash: The last fork crash timestamp before updating it. + * + * If this is the first update of the statistics used to manage a brute force + * attack that happens through the execve system call, its last crash timestamp + * (the timestamp that shows when the execve was called) cannot be used to + * compute the crash period's EMA. Instead, the last fork crash timestamp should + * be used (the last crash timestamp of the child fork hierarchy before updating + * the crash period). This allows that in a brute force attack that happens + * through the fork system call, the exec and fork statistics are the same. In + * this situation, the mitigation method will act only in the processes that are + * sharing the fork statistics. This way, the process that forked before the + * execve system call will not be involved in the mitigation method. In this + * scenario, the parent is not responsible of the child's behaviour. + * + * It's mandatory to disable interrupts before acquiring the brute_stats::lock + * since the task_free hook can be called from an IRQ context during the + * execution of the task_fatal_signal hook. + * + * Context: Must be called with interrupts disabled and tasklist_lock and + * brute_stats_ptr_lock held. + * Return: -EFAULT if there are no exec statistics. Zero otherwise. + */ +static int brute_update_exec_crash_period(struct brute_stats **stats, + u64 now, u64 last_fork_crash) +{ + brute_get_exec_stats(stats); + if (!*stats) + return -EFAULT; + + spin_lock(&(*stats)->lock); + if (!(*stats)->faults) + (*stats)->jiffies = last_fork_crash; + spin_unlock(&(*stats)->lock); + + brute_update_crash_period(*stats, now); + return 0; +} + +/** + * brute_get_crash_period() - Get the application crash period. + * @stats: Statistical data shared by all the fork hierarchy processes. + * + * The statistical data shared by all the fork hierarchy processes cannot be + * NULL. + * + * It's mandatory to disable interrupts before acquiring the brute_stats::lock + * since the task_free hook can be called from an IRQ context during the + * execution of the task_fatal_signal hook. + * + * Context: Must be called with interrupts disabled and brute_stats_ptr_lock + * held. + * Return: The application crash period. + */ +static u64 brute_get_crash_period(struct brute_stats *stats) +{ + u64 crash_period; + + spin_lock(&stats->lock); + crash_period = stats->period; + spin_unlock(&stats->lock); + + return crash_period; +} + +/** + * print_exec_attack_running() - Warn about an exec brute force attack. + * @stats: Statistical data shared by all the fork hierarchy processes. + * + * The statistical data shared by all the fork hierarchy processes cannot be + * NULL. + * + * Before showing the process name it is mandatory to find a process that holds + * a pointer to the exec statistics. + * + * Context: Must be called with tasklist_lock and brute_stats_ptr_lock held. + */ +static void print_exec_attack_running(const struct brute_stats *stats) +{ + struct task_struct *p; + struct brute_stats **p_stats; + bool found = false; + + for_each_process(p) { + p_stats = brute_stats_ptr(p); + if (*p_stats == stats) { + found = true; + break; + } + } + + if (WARN(!found, "No exec process\n")) + return; + + pr_warn("Exec brute force attack detected [%s]\n", p->comm); +} + +/** + * brute_manage_exec_attack() - Manage an exec brute force attack. + * @stats: Statistical data shared by all the fork hierarchy processes. + * @now: The current timestamp in jiffies. + * @last_fork_crash: The last fork crash timestamp before updating it. + * + * For a correct management of an exec brute force attack it is only necessary + * to update the exec statistics and test if an attack is happening based on + * these data. + * + * It is important to note that if the fork and exec crash periods are the same, + * the attack test is avoided. This allows that in a brute force attack that + * happens through the fork system call, the mitigation method does not act on + * the parent process of the fork hierarchy. + * + * The statistical data shared by all the fork hierarchy processes cannot be + * NULL. + * + * It's mandatory to disable interrupts before acquiring the brute_stats::lock + * since the task_free hook can be called from an IRQ context during the + * execution of the task_fatal_signal hook. + * + * Context: Must be called with interrupts disabled and tasklist_lock and + * brute_stats_ptr_lock held. + */ +static void brute_manage_exec_attack(struct brute_stats *stats, u64 now, + u64 last_fork_crash) +{ + int ret; + struct brute_stats *exec_stats = stats; + u64 fork_period; + u64 exec_period; + + ret = brute_update_exec_crash_period(&exec_stats, now, last_fork_crash); + if (WARN(ret, "No exec statistical data\n")) + return; + + fork_period = brute_get_crash_period(stats); + exec_period = brute_get_crash_period(exec_stats); + if (fork_period == exec_period) + return; + + if (brute_attack_running(exec_stats)) + print_exec_attack_running(exec_stats); +} + +/** + * brute_task_fatal_signal() - Target for the task_fatal_signal hook. + * @siginfo: Contains the signal information. + * + * To detect a brute force attack is necessary to update the fork and exec + * statistics in every fatal crash and act based on these data. + * + * It's mandatory to disable interrupts before acquiring brute_stats_ptr_lock + * and brute_stats::lock since the task_free hook can be called from an IRQ + * context during the execution of the task_fatal_signal hook. + */ +static void brute_task_fatal_signal(const kernel_siginfo_t *siginfo) +{ + struct brute_stats **stats; + unsigned long flags; + u64 last_fork_crash; + u64 now = get_jiffies_64(); + + stats = brute_stats_ptr(current); + read_lock(&tasklist_lock); + read_lock_irqsave(&brute_stats_ptr_lock, flags); + + if (WARN(!*stats, "No statistical data\n")) { + read_unlock_irqrestore(&brute_stats_ptr_lock, flags); + read_unlock(&tasklist_lock); + return; } + + last_fork_crash = brute_manage_fork_attack(*stats, now); + brute_manage_exec_attack(*stats, now, last_fork_crash); + read_unlock_irqrestore(&brute_stats_ptr_lock, flags); + read_unlock(&tasklist_lock); } /* @@ -235,6 +694,7 @@ static struct security_hook_list brute_hooks[] __lsm_ro_after_init = { LSM_HOOK_INIT(task_alloc, brute_task_alloc), LSM_HOOK_INIT(bprm_committing_creds, brute_task_execve), LSM_HOOK_INIT(task_free, brute_task_free), + LSM_HOOK_INIT(task_fatal_signal, brute_task_fatal_signal), }; /**
To detect a brute force attack it is necessary that the statistics shared by all the fork hierarchy processes be updated in every fatal crash and the most important data to update is the application crash period. To do so, use the new "task_fatal_signal" LSM hook added in a previous step. The application crash period must be a value that is not prone to change due to spurious data and follows the real crash period. So, to compute it, the exponential moving average (EMA) is used. There are two types of brute force attacks that need to be detected. The first one is an attack that happens through the fork system call and the second one is an attack that happens through the execve system call. The first type uses the statistics shared by all the fork hierarchy processes, but the second type cannot use this statistical data due to these statistics disappear when the involved tasks finished. In this last scenario the attack info should be tracked by the statistics of a higher fork hierarchy (the hierarchy that contains the process that forks before the execve system call). Moreover, these two attack types have two variants. A slow brute force attack that is detected if the maximum number of faults per fork hierarchy is reached and a fast brute force attack that is detected if the application crash period falls below a certain threshold. Also, this patch adds locking to protect the statistics pointer hold by every process. Signed-off-by: John Wood <john.wood@gmx.com> --- security/brute/brute.c | 498 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 479 insertions(+), 19 deletions(-) -- 2.25.1