diff options
| author | David S. Miller <[email protected]> | 2018-02-06 16:32:49 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2018-02-06 16:32:49 +0000 |
| commit | 67ae44e1a6238531a2f324a30b6524d228df3131 (patch) | |
| tree | 9f6a56f4d4d7226b735237e1e99510d2ac194b75 /net/unix/af_unix.c | |
| parent | cls_u32: fix use after free in u32_destroy_key() (diff) | |
| parent | sample/bpf: fix erspan metadata (diff) | |
| download | kernel-67ae44e1a6238531a2f324a30b6524d228df3131.tar.gz kernel-67ae44e1a6238531a2f324a30b6524d228df3131.zip | |
Merge branch 'net-erspan-fixes'
William Tu says:
====================
net: erspan fixes
The first patch fixes erspan metadata extraction issue from packet
header due to commit d350a823020e ("net: erspan: create erspan metadata
uapi header"). The commit moves the erspan 'version' in
'struct erspan_metadata' in front of 'struct erspan_md2' for later
extensibility, but breaks the existing metadata extraction code due
to extra 4-byte size 'version'. The second patch fixes the case where
tunnel device receives an erspan packet with different tunnel metadata
(ex: version, index, hwid, direction), existing code overwrites the
tunnel device's erspan configuration. The third patch fixes the bpf
tests due to the above patches.
====================
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions