Skip to content

Commit 2e9f609

Browse files
PhilPotterdavem330
authored andcommitted
net: hsr: check skb can contain struct hsr_ethhdr in fill_frame_info
Check at start of fill_frame_info that the MAC header in the supplied skb is large enough to fit a struct hsr_ethhdr, as otherwise this is not a valid HSR frame. If it is too small, return an error which will then cause the callers to clean up the skb. Fixes a KMSAN-found uninit-value bug reported by syzbot at: https://syzkaller.appspot.com/bug?id=f7e9b601f1414f814f7602a82b6619a8d80bce3f Reported-by: [email protected] Signed-off-by: Phillip Potter <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent f282df0 commit 2e9f609

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

net/hsr/hsr_forward.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -520,6 +520,10 @@ static int fill_frame_info(struct hsr_frame_info *frame,
520520
struct ethhdr *ethhdr;
521521
__be16 proto;
522522

523+
/* Check if skb contains hsr_ethhdr */
524+
if (skb->mac_len < sizeof(struct hsr_ethhdr))
525+
return -EINVAL;
526+
523527
memset(frame, 0, sizeof(*frame));
524528
frame->is_supervision = is_supervision_frame(port->hsr, skb);
525529
frame->node_src = hsr_get_node(port, &hsr->node_db, skb,

0 commit comments

Comments
 (0)