]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
wireguard: timers: cast enum limits members to int in prints
authorJiri Slaby (SUSE) <jirislaby@kernel.org>
Tue, 13 Dec 2022 22:52:08 +0000 (15:52 -0700)
committerJakub Kicinski <kuba@kernel.org>
Wed, 14 Dec 2022 03:30:45 +0000 (19:30 -0800)
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.

Link: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=36113
Cc: Martin Liska <mliska@suse.cz>
Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Link: https://lore.kernel.org/all/20221213225208.3343692-2-Jason@zx2c4.com/
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/wireguard/timers.c

index b5706b6718b19ec01877ef028b03051c46a99125..53d8a57a0dfa391b386e3ef2ca4ca3b0cf13d7f7 100644 (file)
@@ -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);