3 files changed, 4 insertions, 1 deletions

diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 10396b4bde14..e9114e41affc 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -854,6 +854,7 @@ struct xfrm_algo_comp_info {
 
 struct xfrm_algo_desc {
         char *name;
+        char *compat;
         u8 available:1;
         union {
                 struct xfrm_algo_auth_info auth;
diff --git a/net/xfrm/xfrm_algo.c b/net/xfrm/xfrm_algo.c
index 04e1aea58bc9..b68974b38741 100644
--- a/net/xfrm/xfrm_algo.c
+++ b/net/xfrm/xfrm_algo.c
@@ -359,7 +359,8 @@ static struct xfrm_algo_desc *xfrm_get_byname(struct xfrm_algo_desc *list,
                 return NULL;
 
         for (i = 0; i < entries; i++) {
-                if (strcmp(name, list[i].name))
+                if (strcmp(name, list[i].name) &&
+                    (!list[i].compat || strcmp(name, list[i].compat)))
                         continue;
 
                 if (list[i].available)
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 7d18ca03c80d..fa79ddc4239e 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -213,6 +213,7 @@ static int attach_one_algo(struct xfrm_algo **algpp, u8 *props,
                 return -ENOMEM;
 
         memcpy(p, ualg, len);
+        strcpy(p->alg_name, algo->name);
         *algpp = p;
         return 0;
 }