| From 2ef23f9d784e0f3c5728859b2327eaa2ca5448e0 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sat, 9 Aug 2025 14:20:13 +0800 |
| Subject: selftests/net: Ensure assert() triggers in psock_tpacket.c |
| |
| From: Wake Liu <wakel@google.com> |
| |
| [ Upstream commit bc4c0a48bdad7f225740b8e750fdc1da6d85e1eb ] |
| |
| The get_next_frame() function in psock_tpacket.c was missing a return |
| statement in its default switch case, leading to a compiler warning. |
| |
| This was caused by a `bug_on(1)` call, which is defined as an |
| `assert()`, being compiled out because NDEBUG is defined during the |
| build. |
| |
| Instead of adding a `return NULL;` which would silently hide the error |
| and could lead to crashes later, this change restores the original |
| author's intent. By adding `#undef NDEBUG` before including <assert.h>, |
| we ensure the assertion is active and will cause the test to abort if |
| this unreachable code is ever executed. |
| |
| Signed-off-by: Wake Liu <wakel@google.com> |
| Link: https://patch.msgid.link/20250809062013.2407822-1-wakel@google.com |
| Signed-off-by: Jakub Kicinski <kuba@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| tools/testing/selftests/net/psock_tpacket.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| diff --git a/tools/testing/selftests/net/psock_tpacket.c b/tools/testing/selftests/net/psock_tpacket.c |
| index 93092d13b3c59..ca0d9a5a9e08c 100644 |
| --- a/tools/testing/selftests/net/psock_tpacket.c |
| +++ b/tools/testing/selftests/net/psock_tpacket.c |
| @@ -22,6 +22,7 @@ |
| * - TPACKET_V3: RX_RING |
| */ |
| |
| +#undef NDEBUG |
| #include <stdio.h> |
| #include <stdlib.h> |
| #include <sys/types.h> |
| -- |
| 2.51.0 |
| |
