Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31e69dc6 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "nf: IDLETIMER: Fix possible use before initialization in idletimer_resume"

parents 71c69c1f 65b9a116

net/netfilter/xt_IDLETIMER.c

+7 −1
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ struct idletimer_tg { 
	bool send_nl_msg;

	bool active;

	uid_t uid;

	bool suspend_time_valid;

};



static LIST_HEAD(idletimer_tg_list);
@@ -244,8 +245,13 @@ static int idletimer_resume(struct notifier_block *notifier, 
	switch (pm_event) {

	case PM_SUSPEND_PREPARE:

		get_monotonic_boottime(&timer->last_suspend_time);

		timer->suspend_time_valid = true;

		break;

	case PM_POST_SUSPEND:

		if (!timer->suspend_time_valid)

			break;

		timer->suspend_time_valid = false;



		spin_lock_bh(&timestamp_lock);

		if (!timer->active) {

			spin_unlock_bh(&timestamp_lock);
@@ -280,7 +286,7 @@ static int idletimer_tg_create(struct idletimer_tg_info *info) 
{

	int ret;



	info->timer = kmalloc(sizeof(*info->timer), GFP_KERNEL);

	info->timer = kzalloc(sizeof(*info->timer), GFP_KERNEL);

	if (!info->timer) {

		ret = -ENOMEM;

		goto out;