From: Alexei Starovoitov Date: Sat, 7 Jul 2018 22:19:30 +0000 (-0700) Subject: Merge branch 'sockhash-fixes' X-Git-Tag: v4.19~602^2~61^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4fb126cbcbd6870851f0b3ba503e8ec0e66b9dd5;p=platform%2Fkernel%2Flinux-rpi.git Merge branch 'sockhash-fixes' John Fastabend says: ==================== First three patches resolve issues found while testing sockhash and reviewing code. Syzbot also found them about the same time as I was working on fixes. The main issue is in the sockhash path we reduced the scope of sk_callback lock but this meant we could get update and close running in parallel so fix that here. Then testing sk_msg and sk_skb programs together found that skb->dev is not always assigned and some of the helpers were depending on this to lookup max mtu. Fix this by using SKB_MAX_ALLOC when no MTU is available. Finally, Martin spotted that the sockmap code was still using the qdisc skb cb structure. But I was sure we had fixed this long ago. Looks like we missed it in a merge conflict resolution and then by chance data_end offset was the same in both structures so everything sort of continued to work even though it could break at any moment if the structs ever change. So redo the conversion and this time also convert the helpers. v2: fix '0 files changed' issue in patches ==================== Signed-off-by: Alexei Starovoitov --- 4fb126cbcbd6870851f0b3ba503e8ec0e66b9dd5