wireguard patches for 6.2-rc1
Subsystems (3)
Jason A. Donenfeld
maintainercover wireguard patches for 6.2-rc1
Hi Jakub & Folks,
This tiny pull just has a single patch to ready wireguard for gcc 13, casting some arguments to pr_debug to an (int) explicitly, because gcc 13 changes the type of enums.
Since this is just a fix, I've marked it as 'net', but if you prefer to do it via 'net-next', that's fine too.
Jason
Jiri Slaby (SUSE) (1):
wireguard: timers: cast enum limits members to int in prints
drivers/net/wireguard/timers.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
Signature · 1 line
2.39.0
Jason A. Donenfeld
maintainerPATCH 1/1 wireguard: timers: cast enum limits members to int in prints
From: "Jiri Slaby (SUSE)" <[email protected]>
Since gcc13, each member of an enum has the same type as the enum. And that is inherited from its members. Provided "REKEY_AFTER_MESSAGES = 1ULL << 60", 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'
Cast those particular enum members to int when printing them.
--- drivers/net/wireguard/timers.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/wireguard/timers.c +4 -4
@@ -46,7 +46,7 @@ static void wg_expired_retransmit_handshake(struct timer_list *timer)if (peer->timer_handshake_attempts >MAX_TIMER_HANDSHAKES ) {pr_debug ("%s: Handshake for peer %llu (%pISpfsc) did not complete after %d attempts, giving up\n" , peer->device->dev->name, peer->internal_id, - &peer->endpoint.addr,MAX_TIMER_HANDSHAKES +2 ); + &peer->endpoint.addr, (int )MAX_TIMER_HANDSHAKES +2 );del_timer (&peer->timer_send_keepalive);/* We drop all packets without a keypair and don't try again,
@@ -64,7 +64,7 @@ static void wg_expired_retransmit_handshake(struct timer_list *timer) ++peer->timer_handshake_attempts;pr_debug ("%s: Handshake for peer %llu (%pISpfsc) did not complete after %d seconds, retrying (try %d)\n" , peer->device->dev->name, peer->internal_id, - &peer->endpoint.addr,REKEY_TIMEOUT , + &peer->endpoint.addr, (int )REKEY_TIMEOUT , peer->timer_handshake_attempts +1 );/* We clear the endpoint address src address, in case this is
@@ -94,7 +94,7 @@ static void wg_expired_new_handshake(struct timer_list *timer)pr_debug ("%s: Retrying handshake with peer %llu (%pISpfsc) because we stopped hearing back after %d seconds\n" , peer->device->dev->name, peer->internal_id, - &peer->endpoint.addr,KEEPALIVE_TIMEOUT +REKEY_TIMEOUT ); + &peer->endpoint.addr, (int )(KEEPALIVE_TIMEOUT +REKEY_TIMEOUT ));/* We clear the endpoint address src address, in case this is the cause * of trouble. */
@@ -126,7 +126,7 @@ static void wg_queued_expired_zero_key_material(struct work_struct *work)pr_debug ("%s: Zeroing out all keys for peer %llu (%pISpfsc), since we haven't received a new one in %d seconds\n" , peer->device->dev->name, peer->internal_id, - &peer->endpoint.addr,REJECT_AFTER_TIME *3 ); + &peer->endpoint.addr, (int )REJECT_AFTER_TIME *3 );wg_noise_handshake_clear (&peer->handshake);wg_noise_keypairs_clear (&peer->keypairs);wg_peer_put (peer);
Signature · 1 line
2.39.0