xfrm: Allow xfrmi if_id to be updated by UPDSA

Allow attaching an SA to an xfrm interface id after
the creation of the SA, so that tasks such as keying
which must be done as the SA is created, can remain
separate from the decision on how to route traffic
from an SA. This permits SA creation to be decomposed
in to three separate steps:
1) allocation of a SPI
2) algorithm and key negotiation
3) insertion into the data path

Signed-off-by: Nathan Harold <nharold@google.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>

diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index bd5cb7ad24471284cc1102ba76527f171189c022..b669262682c9763e7c863d6bb77f44ed34402cce 100644 (file)
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -1561,10 +1561,14 @@ out:
                if (x1->curlft.use_time)
                        xfrm_state_check_expire(x1);
 
-               if (x->props.smark.m || x->props.smark.v) {
+               if (x->props.smark.m || x->props.smark.v || x->if_id) {
                        spin_lock_bh(&net->xfrm.xfrm_state_lock);
 
-                       x1->props.smark = x->props.smark;
+                       if (x->props.smark.m || x->props.smark.v)
+                               x1->props.smark = x->props.smark;
+
+                       if (x->if_id)
+                               x1->if_id = x->if_id;
 
                        __xfrm_state_bump_genids(x1);
                        spin_unlock_bh(&net->xfrm.xfrm_state_lock);