Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79dd401f authored by Nathan Harold's avatar Nathan Harold Committed by Benedict Wong
Browse files

UPSTREAM: xfrm: Allow Set Mark to be Updated Using UPDSA 



Allow UPDSA to change "set mark" to permit
policy separation of packet routing decisions from
SA keying in systems that use mark-based routing.

The set mark, used as a routing and firewall mark
for outbound packets, is made update-able which
allows routing decisions to be handled independently
of keying/SA creation. To maintain consistency with
other optional attributes, the set mark is only
updated if sent with a non-zero value.

The per-SA lock and the xfrm_state_lock are taken in
that order to avoid a deadlock with
xfrm_timer_handler(), which also takes the locks in
that order.

Signed-off-by: default avatarNathan Harold <nharold@google.com>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>

(cherry picked from commit 6d8e85ffe17895d7bc632dfbaa9e2e33b22fe873)
Signed-off-by: default avatarBenedict Wong <benedictwong@google.com>
Bug: 113046120
Change-Id: Ie7ab34ca38aedb034cf5aa83457c552c43f4f566
parent 73d9837c

net/xfrm/xfrm_state.c

+9 −0
Original line number Original line Diff line number Diff line
@@ -1559,6 +1559,15 @@ int xfrm_state_update(struct xfrm_state *x) 
		if (x1->curlft.use_time)

		if (x1->curlft.use_time)

			xfrm_state_check_expire(x1);

			xfrm_state_check_expire(x1);





		if (x->props.smark.m || x->props.smark.v) {

			spin_lock_bh(&net->xfrm.xfrm_state_lock);



			x1->props.smark = x->props.smark;



			__xfrm_state_bump_genids(x1);

			spin_unlock_bh(&net->xfrm.xfrm_state_lock);

		}



		err = 0;

		err = 0;

		x->km.state = XFRM_STATE_DEAD;

		x->km.state = XFRM_STATE_DEAD;

		__xfrm_state_put(x);

		__xfrm_state_put(x);