from mainline: Correctly set address length in arp frames

3 files changed, 6 insertions, 3 deletions

diff --git a/src/firejail/arp.c b/src/firejail/arp.c
index 288e5ded3..a8818c960 100644
--- a/src/firejail/arp.c
+++ b/src/firejail/arp.c
@@ -78,7 +78,7 @@ void arp_announce(const char *dev, Bridge *br) {
                 errExit("if_nametoindex");
         addr.sll_family = AF_PACKET;
         memcpy (addr.sll_addr, ifr.ifr_hwaddr.sa_data, 6);
-        addr.sll_halen = htons(6);
+        addr.sll_halen = ETH_ALEN;
 
         // build the arp packet header
         ArpHdr hdr;
@@ -150,7 +150,7 @@ int arp_check(const char *dev, uint32_t destaddr) {
                 errExit("if_nametoindex");
         addr.sll_family = AF_PACKET;
         memcpy (addr.sll_addr, ifr.ifr_hwaddr.sa_data, 6);
-        addr.sll_halen = htons(6);
+        addr.sll_halen = ETH_ALEN;
 
         // build the arp packet header
         ArpHdr hdr;
diff --git a/src/fnet/arp.c b/src/fnet/arp.c
index 794f6c8c8..3c2a2361b 100644
--- a/src/fnet/arp.c
+++ b/src/fnet/arp.c
@@ -124,7 +124,7 @@ void arp_scan(const char *dev, uint32_t ifip, uint32_t ifmask) {
                                 errExit("if_nametoindex");
                         addr.sll_family = AF_PACKET;
                         memcpy (addr.sll_addr, mac, 6);
-                        addr.sll_halen = htons(6);
+                        addr.sll_halen = ETH_ALEN;
 
                         // build the arp packet header
                         ArpHdr hdr;
diff --git a/status b/status
index a9fc82479..84ec18951 100644
--- a/status
+++ b/status
@@ -1,3 +1,6 @@
+2019: Jan 2
+done: Correctly set address length in arp frames
+
 Nov 6: mainline merge
 done: removed transfer.sh support from travis build
 done: fix --bandwidth command