xfrm: add extack support to xfrm_init_replay

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

diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index f427a74d571b2e2e347727ca5b04cb432ebee4fe..c504d07bcb7c1b86dffae116d71b66d560e9dc98 100644 (file)
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -1580,7 +1580,7 @@ int xfrm_dev_state_flush(struct net *net, struct net_device *dev, bool task_vali
 void xfrm_sad_getinfo(struct net *net, struct xfrmk_sadinfo *si);
 void xfrm_spd_getinfo(struct net *net, struct xfrmk_spdinfo *si);
 u32 xfrm_replay_seqhi(struct xfrm_state *x, __be32 net_seq);
-int xfrm_init_replay(struct xfrm_state *x);
+int xfrm_init_replay(struct xfrm_state *x, struct netlink_ext_ack *extack);
 u32 xfrm_state_mtu(struct xfrm_state *x, int mtu);
 int __xfrm_init_state(struct xfrm_state *x, bool init_replay, bool offload,
                      struct netlink_ext_ack *extack);

diff --git a/net/xfrm/xfrm_replay.c b/net/xfrm/xfrm_replay.c
index 9277d81b344cbb0b7910b2189a4aa1f7037384ec..9f4d42eb090f154457902e86f85ac1b269c76625 100644 (file)
--- a/net/xfrm/xfrm_replay.c
+++ b/net/xfrm/xfrm_replay.c
@@ -766,18 +766,22 @@ int xfrm_replay_overflow(struct xfrm_state *x, struct sk_buff *skb)
 }
 #endif
 
-int xfrm_init_replay(struct xfrm_state *x)
+int xfrm_init_replay(struct xfrm_state *x, struct netlink_ext_ack *extack)
 {
        struct xfrm_replay_state_esn *replay_esn = x->replay_esn;
 
        if (replay_esn) {
                if (replay_esn->replay_window >
-                   replay_esn->bmp_len * sizeof(__u32) * 8)
+                   replay_esn->bmp_len * sizeof(__u32) * 8) {
+                       NL_SET_ERR_MSG(extack, "ESN replay window is too large for the chosen bitmap size");
                        return -EINVAL;
+               }
 
                if (x->props.flags & XFRM_STATE_ESN) {
-                       if (replay_esn->replay_window == 0)
+                       if (replay_esn->replay_window == 0) {
+                               NL_SET_ERR_MSG(extack, "ESN replay window must be > 0");
                                return -EINVAL;
+                       }
                        x->repl_mode = XFRM_REPLAY_MODE_ESN;
                } else {
                        x->repl_mode = XFRM_REPLAY_MODE_BMP;

diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 7470d2474796340c9c5cbb59df9f367d83b7ade4..0b59ff7985e65418e96f2ee330f8a496cf96dce8 100644 (file)
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -2686,7 +2686,7 @@ int __xfrm_init_state(struct xfrm_state *x, bool init_replay, bool offload,
 
        x->outer_mode = *outer_mode;
        if (init_replay) {
-               err = xfrm_init_replay(x);
+               err = xfrm_init_replay(x, extack);
                if (err)
                        goto error;
        }

diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 14e9b84f9dadf6aa3ae57b6352c253bf60fea9bb..e73f9efc54c1272dc4da0fb4413bb154276de907 100644 (file)
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -741,7 +741,7 @@ static struct xfrm_state *xfrm_state_construct(struct net *net,
        /* sysctl_xfrm_aevent_etime is in 100ms units */
        x->replay_maxage = (net->xfrm.sysctl_aevent_etime*HZ)/XFRM_AE_ETH_M;
 
-       if ((err = xfrm_init_replay(x)))
+       if ((err = xfrm_init_replay(x, extack)))
                goto error;
 
        /* override default values from above */