xfrm: ipcomp: add extack to ipcomp{4,6}_init_state

And the shared helper ipcomp_init_state.

Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>

diff --git a/include/net/ipcomp.h b/include/net/ipcomp.h
index c31108295079d67fa9ad66840baab315314472c2..8660a2a6d1fc76a7df7e90db95908cedb47b55e3 100644 (file)
--- a/include/net/ipcomp.h
+++ b/include/net/ipcomp.h
@@ -22,7 +22,7 @@ struct xfrm_state;
 int ipcomp_input(struct xfrm_state *x, struct sk_buff *skb);
 int ipcomp_output(struct xfrm_state *x, struct sk_buff *skb);
 void ipcomp_destroy(struct xfrm_state *x);
-int ipcomp_init_state(struct xfrm_state *x);
+int ipcomp_init_state(struct xfrm_state *x, struct netlink_ext_ack *extack);
 
 static inline struct ip_comp_hdr *ip_comp_hdr(const struct sk_buff *skb)
 {

diff --git a/net/ipv4/ipcomp.c b/net/ipv4/ipcomp.c
index 230d1120874fd4c651515b1ace0942c0842934f0..5a4fb2539b08b60212a42638a8e6c4e39eaa472c 100644 (file)
--- a/net/ipv4/ipcomp.c
+++ b/net/ipv4/ipcomp.c
@@ -130,17 +130,20 @@ static int ipcomp4_init_state(struct xfrm_state *x,
                x->props.header_len += sizeof(struct iphdr);
                break;
        default:
+               NL_SET_ERR_MSG(extack, "Unsupported XFRM mode for IPcomp");
                goto out;
        }
 
-       err = ipcomp_init_state(x);
+       err = ipcomp_init_state(x, extack);
        if (err)
                goto out;
 
        if (x->props.mode == XFRM_MODE_TUNNEL) {
                err = ipcomp_tunnel_attach(x);
-               if (err)
+               if (err) {
+                       NL_SET_ERR_MSG(extack, "Kernel error: failed to initialize the associated state");
                        goto out;
+               }
        }
 
        err = 0;

diff --git a/net/ipv6/ipcomp6.c b/net/ipv6/ipcomp6.c
index 7e47009739e9c423fbf488779a35153d77a96a63..72d4858dec18a0b985171c7ddda70e073aa0ac9d 100644 (file)
--- a/net/ipv6/ipcomp6.c
+++ b/net/ipv6/ipcomp6.c
@@ -149,17 +149,20 @@ static int ipcomp6_init_state(struct xfrm_state *x,
                x->props.header_len += sizeof(struct ipv6hdr);
                break;
        default:
+               NL_SET_ERR_MSG(extack, "Unsupported XFRM mode for IPcomp");
                goto out;
        }
 
-       err = ipcomp_init_state(x);
+       err = ipcomp_init_state(x, extack);
        if (err)
                goto out;
 
        if (x->props.mode == XFRM_MODE_TUNNEL) {
                err = ipcomp6_tunnel_attach(x);
-               if (err)
+               if (err) {
+                       NL_SET_ERR_MSG(extack, "Kernel error: failed to initialize the associated state");
                        goto out;
+               }
        }
 
        err = 0;

diff --git a/net/xfrm/xfrm_ipcomp.c b/net/xfrm/xfrm_ipcomp.c
index cb40ff0ff28da274222b6a6b4971dec354c147e2..656045a876067ad126fddf0ace81e1e856f53150 100644 (file)
--- a/net/xfrm/xfrm_ipcomp.c
+++ b/net/xfrm/xfrm_ipcomp.c
@@ -325,18 +325,22 @@ void ipcomp_destroy(struct xfrm_state *x)
 }
 EXPORT_SYMBOL_GPL(ipcomp_destroy);
 
-int ipcomp_init_state(struct xfrm_state *x)
+int ipcomp_init_state(struct xfrm_state *x, struct netlink_ext_ack *extack)
 {
        int err;
        struct ipcomp_data *ipcd;
        struct xfrm_algo_desc *calg_desc;
 
        err = -EINVAL;
-       if (!x->calg)
+       if (!x->calg) {
+               NL_SET_ERR_MSG(extack, "Missing required compression algorithm");
                goto out;
+       }
 
-       if (x->encap)
+       if (x->encap) {
+               NL_SET_ERR_MSG(extack, "IPComp is not compatible with encapsulation");
                goto out;
+       }
 
        err = -ENOMEM;
        ipcd = kzalloc(sizeof(*ipcd), GFP_KERNEL);