Files
linux/net
Benedict Wong bc1c4a192a UPSTREAM: xfrm: Make set-mark default behavior backward compatible
Fixes 9b42c1f, which changed the default route lookup behavior for
tunnel mode SAs in the outbound direction to use the skb mark, whereas
previously mark=0 was used if the output mark was unspecified. In
mark-based routing schemes such as Android’s, this change in default
behavior causes routing loops or lookup failures.

This patch restores the default behavior of using a 0 mark while still
incorporating the skb mark if the SET_MARK (and SET_MARK_MASK) is
specified.

Tested with additions to Android's kernel unit test suite:
https://android-review.googlesource.com/c/kernel/tests/+/860150

Fixes: 9b42c1f ("xfrm: Extend the output_mark to support input direction and masking")
Signed-off-by: Benedict Wong <benedictwong@google.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
(cherry picked from commit e2612cd496)
Bug: 122236988
Test: Passes kernel tests
Change-Id: I1289b5b7b1eb93c6d99a0ba7d28e24c3eb25883d
Signed-off-by: Benedict Wong <benedictwong@google.com>
2019-02-05 02:47:08 +00:00
..
2019-01-13 09:51:08 +01:00
2018-11-04 14:50:51 +01:00
2019-01-31 08:14:31 +01:00
2018-08-27 15:24:33 -07:00
2019-01-31 08:29:40 +01:00
2019-01-31 08:29:40 +01:00
2018-12-01 09:37:27 +01:00
2018-09-24 12:19:27 -07:00
2019-01-26 11:58:37 +01:00
2018-11-04 14:50:51 +01:00
2019-01-13 09:51:00 +01:00
2018-07-24 14:10:42 -07:00
2018-07-24 14:10:42 -07:00
2019-01-09 17:38:33 +01:00
2018-07-24 14:10:43 -07:00
2018-10-18 16:43:06 -07:00