Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Three trivial overlapping conflicts.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 14 deletions

diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index d7cb16f0df5b..eb8d14389601 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -1424,7 +1424,7 @@ static int verify_newpolicy_info(struct xfrm_userpolicy_info *p)
         ret = verify_policy_dir(p->dir);
         if (ret)
                 return ret;
-        if (p->index && ((p->index & XFRM_POLICY_MAX) != p->dir))
+        if (p->index && (xfrm_policy_id2dir(p->index) != p->dir))
                 return -EINVAL;
 
         return 0;
@@ -1513,20 +1513,8 @@ static int validate_tmpl(int nr, struct xfrm_user_tmpl *ut, u16 family)
                         return -EINVAL;
                 }
 
-                switch (ut[i].id.proto) {
-                case IPPROTO_AH:
-                case IPPROTO_ESP:
-                case IPPROTO_COMP:
-#if IS_ENABLED(CONFIG_IPV6)
-                case IPPROTO_ROUTING:
-                case IPPROTO_DSTOPTS:
-#endif
-                case IPSEC_PROTO_ANY:
-                        break;
-                default:
+                if (!xfrm_id_proto_valid(ut[i].id.proto))
                         return -EINVAL;
-                }
-
         }
 
         return 0;