Skip to content

Commit b2cb366

Browse files
committed
net: nsh: Use correct mac_offset to unwind gso skb in nsh_gso_segment()
jira LE-1907 Rebuild_History Non-Buildable kernel-4.18.0-553.16.1.el8_10 commit-author Dong Chenchen <[email protected]> commit c83b493 As the call trace shows, skb_panic was caused by wrong skb->mac_header in nsh_gso_segment(): invalid opcode: 0000 [#1] PREEMPT SMP KASAN PTI CPU: 3 PID: 2737 Comm: syz Not tainted 6.3.0-next-20230505 #1 RIP: 0010:skb_panic+0xda/0xe0 call Trace: skb_push+0x91/0xa0 nsh_gso_segment+0x4f3/0x570 skb_mac_gso_segment+0x19e/0x270 __skb_gso_segment+0x1e8/0x3c0 validate_xmit_skb+0x452/0x890 validate_xmit_skb_list+0x99/0xd0 sch_direct_xmit+0x294/0x7c0 __dev_queue_xmit+0x16f0/0x1d70 packet_xmit+0x185/0x210 packet_snd+0xc15/0x1170 packet_sendmsg+0x7b/0xa0 sock_sendmsg+0x14f/0x160 The root cause is: nsh_gso_segment() use skb->network_header - nhoff to reset mac_header in skb_gso_error_unwind() if inner-layer protocol gso fails. However, skb->network_header may be reset by inner-layer protocol gso function e.g. mpls_gso_segment. skb->mac_header reset by the inaccurate network_header will be larger than skb headroom. nsh_gso_segment nhoff = skb->network_header - skb->mac_header; __skb_pull(skb,nsh_len) skb_mac_gso_segment mpls_gso_segment skb_reset_network_header(skb);//skb->network_header+=nsh_len return -EINVAL; skb_gso_error_unwind skb_push(skb, nsh_len); skb->mac_header = skb->network_header - nhoff; // skb->mac_header > skb->headroom, cause skb_push panic Use correct mac_offset to restore mac_header and get rid of nhoff. Fixes: c411ed8 ("nsh: add GSO support") Reported-by: [email protected] Suggested-by: Eric Dumazet <[email protected]> Signed-off-by: Dong Chenchen <[email protected]> Signed-off-by: David S. Miller <[email protected]> (cherry picked from commit c83b493) Signed-off-by: Jonathan Maple <[email protected]>
1 parent 172cf7f commit b2cb366

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

net/nsh/nsh.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,12 @@ static struct sk_buff *nsh_gso_segment(struct sk_buff *skb,
8080
netdev_features_t features)
8181
{
8282
struct sk_buff *segs = ERR_PTR(-EINVAL);
83+
u16 mac_offset = skb->mac_header;
8384
unsigned int nsh_len, mac_len;
8485
__be16 proto;
85-
int nhoff;
8686

8787
skb_reset_network_header(skb);
8888

89-
nhoff = skb->network_header - skb->mac_header;
9089
mac_len = skb->mac_len;
9190

9291
if (unlikely(!pskb_may_pull(skb, NSH_BASE_HDR_LEN)))
@@ -111,15 +110,14 @@ static struct sk_buff *nsh_gso_segment(struct sk_buff *skb,
111110
segs = skb_mac_gso_segment(skb, features);
112111
if (IS_ERR_OR_NULL(segs)) {
113112
skb_gso_error_unwind(skb, htons(ETH_P_NSH), nsh_len,
114-
skb->network_header - nhoff,
115-
mac_len);
113+
mac_offset, mac_len);
116114
goto out;
117115
}
118116

119117
for (skb = segs; skb; skb = skb->next) {
120118
skb->protocol = htons(ETH_P_NSH);
121119
__skb_push(skb, nsh_len);
122-
skb_set_mac_header(skb, -nhoff);
120+
skb->mac_header = mac_offset;
123121
skb->network_header = skb->mac_header + mac_len;
124122
skb->mac_len = mac_len;
125123
}

0 commit comments

Comments
 (0)