Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5A59217D5 for ; Sat, 1 Jul 2023 02:53:28 +0000 (UTC) Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 415AE44A4 for ; Fri, 30 Jun 2023 19:48:27 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-bb2fae9b286so2390456276.3 for ; Fri, 30 Jun 2023 19:48:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1688179706; x=1690771706; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=2wiAgAbJ3Wjk7juSdNsz+B6N/zmZMeaxN1RCHIrworw=; b=v1GkwW4nC+pVReYvqFnYNcwxPf2Y9B5iZ93DnaYI3lpFTLnOEqDVAlMPcHBrDFQuVp SJjqHzBtxtaFgZsYCLvVUYLgSOUXJGyj9au2rls2sG9NT/wxh1nYPfE51flcoVE1lvSe /zM5udXJ3T4YGizkRntPmdW2GwLED/BESksWtA+yXpqLEIxt5ydt+MNJdxdqX/a6saPC QygS3pepp3W0k68HQSD4whDX8j4BcVaj/r7u/QonPV1qv3rD05ttnbAnRvv3FXFWnmVZ etReit6VJmOshaKtMLUZ3cTSiBplBUXR+sqvpMKJhAayFrYyHnXhVzHOl+1gNc0GJ3Vf nIYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688179706; x=1690771706; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=2wiAgAbJ3Wjk7juSdNsz+B6N/zmZMeaxN1RCHIrworw=; b=NbJaSY7AQS6N2Nsmz1+8i0JouazVklB+07cX4Ey+qkFaUmRXGeYlIZTTWLIkCiESDD GbTf/69EVvoqwn8kcrkWhtpbWEqdeVxpXfjdsdxaVEVMjzEVgHIA+dlPgNcJlfkNJslG lZGFf+nAA8sZkEFcgieaEM0OMUe23/hpVvduCg0lvPcPMuPmf5ZlBFS5atIwN0h6df+H E17p17XsQEbMJGXAEMweIdPQZc4oHOcEL+iqrm4ByLKd/Q2wvMQP/cOfoelNReC1lo/I OrN0JIcZ7TVQeqzgg7EvSpCU15kI0YfY5pgfIisYKNAYL1V6mNOiqea0G74oHRHuThAt vzvQ== X-Gm-Message-State: ABy/qLZPI+Cu2UOgIb0PtPw2+AmmzjGr150GAvIcdgW3sIv76wOgV36n aZAvj/qneuJI+Do8AKoPb3W2SXqwnFuXsw== X-Google-Smtp-Source: APBJJlGbwjoRXF7vacvhH66Iu43FGmpxCA2Jtx/7qBuDnjy/Xv/cMzkDA580jYYvHSn/vDiXVoLiZwVAGHDBNw== X-Received: from edumazet1.c.googlers.com ([fda3:e722:ac3:cc00:2b:7d90:c0a8:395a]) (user=edumazet job=sendgmr) by 2002:a25:346:0:b0:bac:adb8:a605 with SMTP id 67-20020a250346000000b00bacadb8a605mr30376ybd.2.1688179706427; Fri, 30 Jun 2023 19:48:26 -0700 (PDT) Date: Sat, 1 Jul 2023 02:48:24 +0000 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.41.0.255.g8b1d071c50-goog Message-ID: <20230701024825.2689655-1-edumazet@google.com> Subject: [PATCH net] net: fix net_dev_start_xmit trace event vs skb_transport_offset() From: Eric Dumazet To: "David S . Miller" , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, eric.dumazet@gmail.com, Eric Dumazet , syzbot Content-Type: text/plain; charset="UTF-8" After blamed commit, we must be more careful about using skb_transport_offset(), as reminded us by syzbot: WARNING: CPU: 0 PID: 10 at include/linux/skbuff.h:2868 skb_transport_offset include/linux/skbuff.h:2977 [inline] WARNING: CPU: 0 PID: 10 at include/linux/skbuff.h:2868 perf_trace_net_dev_start_xmit+0x89a/0xce0 include/trace/events/net.h:14 Modules linked in: CPU: 0 PID: 10 Comm: kworker/u4:1 Not tainted 6.1.30-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 05/27/2023 Workqueue: bat_events batadv_iv_send_outstanding_bat_ogm_packet RIP: 0010:skb_transport_header include/linux/skbuff.h:2868 [inline] RIP: 0010:skb_transport_offset include/linux/skbuff.h:2977 [inline] RIP: 0010:perf_trace_net_dev_start_xmit+0x89a/0xce0 include/trace/events/net.h:14 Code: 8b 04 25 28 00 00 00 48 3b 84 24 c0 00 00 00 0f 85 4e 04 00 00 48 8d 65 d8 5b 41 5c 41 5d 41 5e 41 5f 5d c3 cc e8 56 22 01 fd <0f> 0b e9 f6 fc ff ff 89 f9 80 e1 07 80 c1 03 38 c1 0f 8c 86 f9 ff RSP: 0018:ffffc900002bf700 EFLAGS: 00010293 RAX: ffffffff8485d8ca RBX: 000000000000ffff RCX: ffff888100914280 RDX: 0000000000000000 RSI: 000000000000ffff RDI: 000000000000ffff RBP: ffffc900002bf818 R08: ffffffff8485d5b6 R09: fffffbfff0f8fb5e R10: 0000000000000000 R11: dffffc0000000001 R12: 1ffff110217d8f67 R13: ffff88810bec7b3a R14: dffffc0000000000 R15: dffffc0000000000 FS: 0000000000000000(0000) GS:ffff8881f6a00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f96cf6d52f0 CR3: 000000012224c000 CR4: 0000000000350ef0 Call Trace: [] trace_net_dev_start_xmit include/trace/events/net.h:14 [inline] [] xmit_one net/core/dev.c:3643 [inline] [] dev_hard_start_xmit+0x705/0x980 net/core/dev.c:3660 [] __dev_queue_xmit+0x16b2/0x3370 net/core/dev.c:4324 [] dev_queue_xmit include/linux/netdevice.h:3030 [inline] [] batadv_send_skb_packet+0x3f3/0x680 net/batman-adv/send.c:108 [] batadv_send_broadcast_skb+0x24/0x30 net/batman-adv/send.c:127 [] batadv_iv_ogm_send_to_if net/batman-adv/bat_iv_ogm.c:393 [inline] [] batadv_iv_ogm_emit net/batman-adv/bat_iv_ogm.c:421 [inline] [] batadv_iv_send_outstanding_bat_ogm_packet+0x69a/0x840 net/batman-adv/bat_iv_ogm.c:1701 [] process_one_work+0x8ac/0x1170 kernel/workqueue.c:2289 [] worker_thread+0xaa8/0x12d0 kernel/workqueue.c:2436 Fixes: 66e4c8d95008 ("net: warn if transport header was not set") Signed-off-by: Eric Dumazet Reported-by: syzbot --- include/trace/events/net.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/trace/events/net.h b/include/trace/events/net.h index da611a7aaf970f541949cdd87ac9203c4c7e81b1..f667c76a3b022971b28e8418ad681d8aa0a26442 100644 --- a/include/trace/events/net.h +++ b/include/trace/events/net.h @@ -51,7 +51,8 @@ TRACE_EVENT(net_dev_start_xmit, __entry->network_offset = skb_network_offset(skb); __entry->transport_offset_valid = skb_transport_header_was_set(skb); - __entry->transport_offset = skb_transport_offset(skb); + __entry->transport_offset = skb_transport_header_was_set(skb) ? + skb_transport_offset(skb) : 0; __entry->tx_flags = skb_shinfo(skb)->tx_flags; __entry->gso_size = skb_shinfo(skb)->gso_size; __entry->gso_segs = skb_shinfo(skb)->gso_segs; -- 2.41.0.255.g8b1d071c50-goog