wireguard (gcc13): move ULLs limits away from enum
Subsystems (3)
PATCH v2 1/1 wireguard (gcc13): move ULLs limits away from enum
Since gcc13, each member of an enum has the same type as the enum [1]. And that is inherited from its members. Provided these two:
REKEY_AFTER_MESSAGES = 1ULL << 60
REJECT_AFTER_MESSAGES = U64_MAX - COUNTER_WINDOW_SIZE - 1
the named type is unsigned long.
This generates warnings with gcc-13:
error: format '%d' expects argument of type 'int', but argument 6 has type 'long unsigned int'
Define such high values as macros instead of in the enum. Note that enums are not guaranteed to hold unsigned longs in any way.
And use BIT_ULL() for REKEY_AFTER_MESSAGES.
[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=36113
---
Notes:
[v2] move the constant out of enum (David)
drivers/net/wireguard/messages.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/wireguard/messages.h +3 -2
@@ -37,9 +37,10 @@ enum counter_values {COUNTER_WINDOW_SIZE =COUNTER_BITS_TOTAL -COUNTER_REDUNDANT_BITS }; +#define REKEY_AFTER_MESSAGES BIT_ULL(60) +#define REJECT_AFTER_MESSAGES (U64_MAX - COUNTER_WINDOW_SIZE - 1) +enum limits { -REKEY_AFTER_MESSAGES =1ULL <<60 , -REJECT_AFTER_MESSAGES =U64_MAX -COUNTER_WINDOW_SIZE -1 ,REKEY_TIMEOUT =5 ,REKEY_TIMEOUT_JITTER_MAX_JIFFIES =HZ /3 ,REKEY_AFTER_TIME =120 ,
Signature · 1 line
2.38.1
Jason A. Donenfeld
maintainerI have this queued up already as:
https://git.zx2c4.com/wireguard-linux/commit/?id=3d9d8bba03db21f3276324cdba43c82be5d60729
I liked this variant better.
Jason