| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <710557cef8fb8472628862d9b65edcf7aeb32bb5.1745323279.git.fmaurer@redhat.com>
Date: Tue, 22 Apr 2025 14:02:37 +0200
From: Felix Maurer <fmaurer@...hat.com>
To: socketcan@...tkopp.net,
mkl@...gutronix.de
Cc: shuah@...nel.org,
davem@...emloft.net,
edumazet@...gle.com,
kuba@...nel.org,
pabeni@...hat.com,
horms@...nel.org,
linux-can@...r.kernel.org,
netdev@...r.kernel.org,
linux-kselftest@...r.kernel.org,
dcaratti@...hat.com,
fstornio@...hat.com
Subject: [PATCH 4/4] selftests: can: Document test_raw_filter test cases
The expected results did not explain very well what was really tested. Make
the expectations more clear by writing out the flags that should be set in
the received frames and add a short explanation for each test case. Also,
document the overall test design.
Signed-off-by: Felix Maurer <fmaurer@...hat.com>
---
.../selftests/net/can/test_raw_filter.c | 65 ++++++++++++++-----
1 file changed, 49 insertions(+), 16 deletions(-)
diff --git a/tools/testing/selftests/net/can/test_raw_filter.c b/tools/testing/selftests/net/can/test_raw_filter.c
index 7fe11e020a1c..8d43053824d2 100644
--- a/tools/testing/selftests/net/can/test_raw_filter.c
+++ b/tools/testing/selftests/net/can/test_raw_filter.c
@@ -101,94 +101,113 @@ FIXTURE_VARIANT(can_filters) {
int exp_num_rx;
int exp_rxbits;
};
+#define T_EFF (CAN_EFF_FLAG >> 28)
+#define T_RTR (CAN_RTR_FLAG >> 28)
+/* Receive all frames when filtering for the ID in standard frame format */
FIXTURE_VARIANT_ADD(can_filters, base) {
.testcase = 1,
.id = ID,
.mask = CAN_SFF_MASK,
.exp_num_rx = 4,
- .exp_rxbits = 4369,
+ .exp_rxbits = (1 | 1 << (T_EFF) | 1 << (T_RTR) | 1 << (T_EFF | T_RTR)),
};
+/* Ignore EFF flag in filter ID if not covered by filter mask */
FIXTURE_VARIANT_ADD(can_filters, base_eff) {
.testcase = 2,
.id = ID | CAN_EFF_FLAG,
.mask = CAN_SFF_MASK,
.exp_num_rx = 4,
- .exp_rxbits = 4369,
+ .exp_rxbits = (1 | 1 << (T_EFF) | 1 << (T_RTR) | 1 << (T_EFF | T_RTR)),
};
+/* Ignore RTR flag in filter ID if not covered by filter mask */
FIXTURE_VARIANT_ADD(can_filters, base_rtr) {
.testcase = 3,
.id = ID | CAN_RTR_FLAG,
.mask = CAN_SFF_MASK,
.exp_num_rx = 4,
- .exp_rxbits = 4369,
+ .exp_rxbits = (1 | 1 << (T_EFF) | 1 << (T_RTR) | 1 << (T_EFF | T_RTR)),
};
+/* Ignore EFF and RTR flags in filter ID if not covered by filter mask */
FIXTURE_VARIANT_ADD(can_filters, base_effrtr) {
.testcase = 4,
.id = ID | CAN_EFF_FLAG | CAN_RTR_FLAG,
.mask = CAN_SFF_MASK,
.exp_num_rx = 4,
- .exp_rxbits = 4369,
+ .exp_rxbits = (1 | 1 << (T_EFF) | 1 << (T_RTR) | 1 << (T_EFF | T_RTR)),
};
+/* Receive only SFF frames when expecting no EFF flag */
FIXTURE_VARIANT_ADD(can_filters, filter_eff) {
.testcase = 5,
.id = ID,
.mask = CAN_SFF_MASK | CAN_EFF_FLAG,
.exp_num_rx = 2,
- .exp_rxbits = 17,
+ .exp_rxbits = (1 | 1 << (T_RTR)),
};
+/* Receive only EFF frames when filter id and filter mask include EFF flag */
FIXTURE_VARIANT_ADD(can_filters, filter_eff_eff) {
.testcase = 6,
.id = ID | CAN_EFF_FLAG,
.mask = CAN_SFF_MASK | CAN_EFF_FLAG,
.exp_num_rx = 2,
- .exp_rxbits = 4352,
+ .exp_rxbits = (1 << (T_EFF) | 1 << (T_EFF | T_RTR)),
};
+/* Receive only SFF frames when expecting no EFF flag, ignoring RTR flag */
FIXTURE_VARIANT_ADD(can_filters, filter_eff_rtr) {
.testcase = 7,
.id = ID | CAN_RTR_FLAG,
.mask = CAN_SFF_MASK | CAN_EFF_FLAG,
.exp_num_rx = 2,
- .exp_rxbits = 17,
+ .exp_rxbits = (1 | 1 << (T_RTR)),
};
+/* Receive only EFF frames when filter id and filter mask include EFF flag,
+ * ignoring RTR flag
+ */
FIXTURE_VARIANT_ADD(can_filters, filter_eff_effrtr) {
.testcase = 8,
.id = ID | CAN_EFF_FLAG | CAN_RTR_FLAG,
.mask = CAN_SFF_MASK | CAN_EFF_FLAG,
.exp_num_rx = 2,
- .exp_rxbits = 4352,
+ .exp_rxbits = (1 << (T_EFF) | 1 << (T_EFF | T_RTR)),
};
+/* Receive no remote frames when filtering for no RTR flag */
FIXTURE_VARIANT_ADD(can_filters, filter_rtr) {
.testcase = 9,
.id = ID,
.mask = CAN_SFF_MASK | CAN_RTR_FLAG,
.exp_num_rx = 2,
- .exp_rxbits = 257,
+ .exp_rxbits = (1 | 1 << (T_EFF)),
};
+/* Receive no remote frames when filtering for no RTR flag, ignoring EFF flag */
FIXTURE_VARIANT_ADD(can_filters, filter_rtr_eff) {
.testcase = 10,
.id = ID | CAN_EFF_FLAG,
.mask = CAN_SFF_MASK | CAN_RTR_FLAG,
.exp_num_rx = 2,
- .exp_rxbits = 257,
+ .exp_rxbits = (1 | 1 << (T_EFF)),
};
+/* Receive only remote frames when filter includes RTR flag */
FIXTURE_VARIANT_ADD(can_filters, filter_rtr_rtr) {
.testcase = 11,
.id = ID | CAN_RTR_FLAG,
.mask = CAN_SFF_MASK | CAN_RTR_FLAG,
.exp_num_rx = 2,
- .exp_rxbits = 4112,
+ .exp_rxbits = (1 << (T_RTR) | 1 << (T_EFF | T_RTR)),
};
+/* Receive only remote frames when filter includes RTR flag, ignoring EFF
+ * flag
+ */
FIXTURE_VARIANT_ADD(can_filters, filter_rtr_effrtr) {
.testcase = 12,
.id = ID | CAN_EFF_FLAG | CAN_RTR_FLAG,
.mask = CAN_SFF_MASK | CAN_RTR_FLAG,
.exp_num_rx = 2,
- .exp_rxbits = 4112,
+ .exp_rxbits = (1 << (T_RTR) | 1 << (T_EFF | T_RTR)),
};
+/* Receive only SFF data frame when filtering for no flags */
FIXTURE_VARIANT_ADD(can_filters, filter_effrtr) {
.testcase = 13,
.id = ID,
@@ -196,28 +215,34 @@ FIXTURE_VARIANT_ADD(can_filters, filter_effrtr) {
.exp_num_rx = 1,
.exp_rxbits = 1,
};
+/* Receive only EFF data frame when filtering for EFF but no RTR flag */
FIXTURE_VARIANT_ADD(can_filters, filter_effrtr_eff) {
.testcase = 14,
.id = ID | CAN_EFF_FLAG,
.mask = CAN_SFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG,
.exp_num_rx = 1,
- .exp_rxbits = 256,
+ .exp_rxbits = (1 << (T_EFF)),
};
+/* Receive only SFF remote frame when filtering for RTR but no EFF flag */
FIXTURE_VARIANT_ADD(can_filters, filter_effrtr_rtr) {
.testcase = 15,
.id = ID | CAN_RTR_FLAG,
.mask = CAN_SFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG,
.exp_num_rx = 1,
- .exp_rxbits = 16,
+ .exp_rxbits = (1 << (T_RTR)),
};
+/* Receive only EFF remote frame when filtering for EFF and RTR flag */
FIXTURE_VARIANT_ADD(can_filters, filter_effrtr_effrtr) {
.testcase = 16,
.id = ID | CAN_EFF_FLAG | CAN_RTR_FLAG,
.mask = CAN_SFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG,
.exp_num_rx = 1,
- .exp_rxbits = 4096,
+ .exp_rxbits = (1 << (T_EFF | T_RTR)),
};
+/* Receive only SFF data frame when filtering for no EFF flag and no RTR flag
+ * but based on EFF mask
+ */
FIXTURE_VARIANT_ADD(can_filters, eff) {
.testcase = 17,
.id = ID,
@@ -225,14 +250,22 @@ FIXTURE_VARIANT_ADD(can_filters, eff) {
.exp_num_rx = 1,
.exp_rxbits = 1,
};
+/* Receive only EFF data frame when filtering for EFF flag and no RTR flag but
+ * based on EFF mask
+ */
FIXTURE_VARIANT_ADD(can_filters, eff_eff) {
.testcase = 18,
.id = ID | CAN_EFF_FLAG,
.mask = CAN_EFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG,
.exp_num_rx = 1,
- .exp_rxbits = 256,
+ .exp_rxbits = (1 << (T_EFF)),
};
+/* This test verifies that the raw CAN filters work, by checking if only frames
+ * with the expected set of flags are received. For each test case, the given
+ * filter (id and mask) is added and four CAN frames are sent with every
+ * combination of set/unset EFF/RTR flags.
+ */
TEST_F(can_filters, test_filter)
{
fd_set rdfs;
--
2.49.0
Powered by blists - more mailing lists