net: arp: Fix ARP protocol handler to not use Ethernet hdr directly #85955
Conversation
| @@ -787,14 +787,6 @@ enum net_verdict net_arp_input(struct net_pkt *pkt, | |||
| struct net_pkt *reply; | |||
| struct in_addr *addr; | |||
|
|
|||
| if (net_pkt_get_len(pkt) < (sizeof(struct net_arp_hdr) - | |||
There was a problem hiding this comment.
Is it ok to drop the length check though? I think we should still verify the packet length before accessing the ARP header. It could be simplified to just net_pkt_get_len(pkt) < (sizeof(struct net_arp_hdr) I believe.
There was a problem hiding this comment.
I dropped it because it would not work any more, but I suppose we can add at least that ARP header len check there.
There was a problem hiding this comment.
Nice patch.
Just an idea:
net_arp_input only uses ð_hdr->dst and ð_hdr->src. They could use net_pkt_lladdr_dst(pkt) and net_pkt_lladdr_src(pkt) directly instead, so we need not pass the header as separate pointer?
Note it is also passed to arp_prepare_reply and then unused there. We can probably just remove it there.
jukkar
force-pushed
the
fix/arp-l2-handling
branch
from
9efbd06 to
6d46adc
Compare
|
|
The ARP protocol handler cannot directly access the Ethernet header because the caller has removed the header already when the handler is called. So change net_arp_input() and pass source and destination MAC address there instead of bogus pointer that was pointing to ARP header instead of Ethernet header. This requires changes to ARP tests. Signed-off-by: Jukka Rissanen <[email protected]>
jukkar
force-pushed
the
fix/arp-l2-handling
branch
from
6d46adc to
8310457
Compare
The ARP protocol handler cannot directly access the Ethernet header because the caller has removed the header already when the handler is called.