bybrooklyn/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-04-18 06:44:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Browse Source 
Cross-merge networking fixes after downstream PR.

No conflicts.

Adjacent changes:

kernel/bpf/verifier.c
  829955981c ("bpf: Fix verifier log for async callback return values")
  a923819fb2 ("bpf: Treat first argument as return value for bpf_throw")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski
2023-10-12 16:17:46 -07:00
parent 2f0968a030 e8c127b057
commit 0e6bb5b7f4
251 changed files with 3342 additions and 1393 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
net/packet/af_packet.c
View File

@@ -3607,7 +3607,12 @@ static int packet_getname(struct socket *sock, struct sockaddr *uaddr,
if (dev) {
sll->sll_hatype = dev->type;
sll->sll_halen = dev->addr_len;
memcpy(sll->sll_addr_flex, dev->dev_addr, dev->addr_len);
/* Let __fortify_memcpy_chk() know the actual buffer size. */
memcpy(((struct sockaddr_storage *)sll)->__data +
offsetof(struct sockaddr_ll, sll_addr) -
offsetofend(struct sockaddr_ll, sll_family),
dev->dev_addr, dev->addr_len);
} else {
sll->sll_hatype = 0; /* Bad: we have no ARPHRD_UNSPEC */
sll->sll_halen = 0;