Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Thu, 17 Nov 2022 10:48:33 -0000
From:   tip-bot2 for =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= 
        <tip-bot2@linutronix.de>
Sender: tip-bot2@linutronix.de
Reply-to: linux-kernel@vger.kernel.org
To:     linux-tip-commits@vger.kernel.org
Subject: [tip: timers/core] timerqueue: Use rb_entry_safe() in timerqueue_getnext()
Cc:     pobrn@protonmail.com, Thomas Gleixner <tglx@linutronix.de>,
        x86@kernel.org, linux-kernel@vger.kernel.org
In-Reply-To: <20221114195421.342929-1-pobrn@protonmail.com>
References: <20221114195421.342929-1-pobrn@protonmail.com>
MIME-Version: 1.0
Message-ID: <166868211308.4906.2733783319911974339.tip-bot2@tip-bot2>
Robot-ID: <tip-bot2@linutronix.de>
Robot-Unsubscribe: Contact <mailto:tglx@linutronix.de> to get blacklisted from these emails
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

The following commit has been merged into the timers/core branch of tip:

Commit-ID:     2f117484329b233455ee278f2d9b0a4356835060
Gitweb:        https://git.kernel.org/tip/2f117484329b233455ee278f2d9b0a43568=
35060
Author:        Barnab=C3=A1s P=C5=91cze <pobrn@protonmail.com>
AuthorDate:    Mon, 14 Nov 2022 19:54:23=20
Committer:     Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Thu, 17 Nov 2022 11:26:20 +01:00

timerqueue: Use rb_entry_safe() in timerqueue_getnext()

When `timerqueue_getnext()` is called on an empty timer queue, it will
use `rb_entry()` on a NULL pointer, which is invalid. Fix that by using
`rb_entry_safe()` which handles NULL pointers.

This has not caused any issues so far because the offset of the `rb_node`
member in `timerqueue_node` is 0, so `rb_entry()` is essentially a no-op.

Fixes: 511885d7061e ("lib/timerqueue: Rely on rbtree semantics for next timer=
")
Signed-off-by: Barnab=C3=A1s P=C5=91cze <pobrn@protonmail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20221114195421.342929-1-pobrn@protonmail.com

---
 include/linux/timerqueue.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/timerqueue.h b/include/linux/timerqueue.h
index 9388408..adc80e2 100644
--- a/include/linux/timerqueue.h
+++ b/include/linux/timerqueue.h
@@ -35,7 +35,7 @@ struct timerqueue_node *timerqueue_getnext(struct timerqueu=
e_head *head)
 {
 	struct rb_node *leftmost =3D rb_first_cached(&head->rb_root);
=20
-	return rb_entry(leftmost, struct timerqueue_node, node);
+	return rb_entry_safe(leftmost, struct timerqueue_node, node);
 }
=20
 static inline void timerqueue_init(struct timerqueue_node *node)