ipvs: fix races around est_mutex and est_cpulist
Subsystems (4)
Julian Anastasov
maintainerPATCH v5 1/1 ipvs: fix races around est_mutex and est_cpulist
Sashiko reports for races and possible crash around the usage of est_cpulist_valid and sysctl_est_cpulist. The problem is that we do not lock est_mutex in some places which can lead to wrong write ordering and as result problems when calling cpumask_weight() and cpumask_empty().
Fix them by moving the est_max_threads read/write under locked est_mutex. Do the same for one ip_vs_est_reload_start() call to protect the cpumask_empty() usage of sysctl_est_cpulist.
To remove the chance of deadlock while stopping the estimation kthreads, keep the data structure for kthread 0 even after last estimator is removed and do not hold mutexes while stopping this task. Now we will use a new flag 'needed' to know when kthread 0 should run. The kthreads above 0 do not use mutexes, so stop them under est_mutex because their kthread data still can be destroyed if they do not serve estimators. Now all kthreads will be started by the est_reload_work to properly serialize the stop/start for kthread 0.
Reduce the use of service_mutex in ip_vs_est_calc_phase() because under est_mutex we can safely walk est_kt_arr to stop the kthreads above slot 0.
As ip_vs_stop_estimator() for tot_stats should be called under service_mutex, do it early in the netns exit path in ip_vs_flush() to avoid locking the mutex again later. It still should be called in ip_vs_control_net_cleanup_sysctl() when we are called during netns init error. Use -2 for ktid as indicator if estimator was already stopped.
Finally, fix use-after-free for kd->est_row in ip_vs_est_calc_phase(). est->ktrow should simply switch to a delay value while estimator is linked to est_temp_list.
--- include/net/ip_vs.h | 11 ++++- net/netfilter/ipvs/ip_vs_ctl.c | 51 +++++++++++++++++---- net/netfilter/ipvs/ip_vs_est.c | 83 ++++++++++++++++++++-------------- 3 files changed, 100 insertions(+), 45 deletions(-)
include/net/ip_vs.h +10 -1
@@ -491,6 +491,7 @@ struct ip_vs_est_kt_data {DECLARE_BITMAP (avail,IPVS_EST_NTICKS );/* tick has space for ests */ unsigned long est_timer;/* estimation timer (jiffies) */ struct ip_vs_stats *calc_stats;/* Used for calculation */ +int needed;/* task is needed */ int tick_len[IPVS_EST_NTICKS ];/* est count */ int id;/* ktid per netns */ int chain_max;/* max ests per tick chain */
@@ -1884,11 +1885,19 @@ int ip_vs_start_estimator(struct netns_ipvs *ipvs, struct ip_vs_stats *stats);void ip_vs_stop_estimator (struct netns_ipvs *ipvs,struct ip_vs_stats *stats);void ip_vs_zero_estimator (struct ip_vs_stats *stats);void ip_vs_read_estimator (struct ip_vs_kstats *dst,struct ip_vs_stats *stats); -void ip_vs_est_reload_start (struct netns_ipvs *ipvs); +void ip_vs_est_reload_start (struct netns_ipvs *ipvs,bool restart);int ip_vs_est_kthread_start (struct netns_ipvs *ipvs,struct ip_vs_est_kt_data *kd);void ip_vs_est_kthread_stop (struct ip_vs_est_kt_data *kd); +static inline void ip_vs_stop_estimator_tot_stats (struct netns_ipvs *ipvs) +{ +#ifdef CONFIG_SYSCTL +ip_vs_stop_estimator (ipvs, &ipvs->tot_stats->s); + ipvs->tot_stats->s.est.ktid =-2 ; +#endif +} +static inline void ip_vs_est_stopped_recalc (struct netns_ipvs *ipvs) {#ifdef CONFIG_SYSCTL
net/netfilter/ipvs/ip_vs_ctl.c +42 -9
99 lines not on this page · raw message
net/netfilter/ipvs/ip_vs_est.c +48 -35
184 lines not on this page · raw message
Signature · 1 line
2.53.0