summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIlan Tayari <ilant@mellanox.com>2017-04-30 16:51:19 +0300
committerDavid S. Miller <davem@davemloft.net>2017-05-01 14:59:39 -0400
commit152afb9b45a8af4a93699a15925c392a28182a26 (patch)
tree310ad3247951c8e65add607f5f938f27171e2e21
parent67d349ed603d5ce4a6f1722b1736e2bcef0e8690 (diff)
downloadlinux-stable-152afb9b45a8af4a93699a15925c392a28182a26.tar.gz
linux-stable-152afb9b45a8af4a93699a15925c392a28182a26.tar.bz2
linux-stable-152afb9b45a8af4a93699a15925c392a28182a26.zip
xfrm: Indicate xfrm_state offload errors
Current code silently ignores driver errors when configuring IPSec offload xfrm_state, and falls back to host-based crypto. Fail the xfrm_state creation if the driver has an error, because the NIC offloading was explicitly requested by the user program. This will communicate back to the user that there was an error. Fixes: d77e38e612a0 ("xfrm: Add an IPsec hardware offloading API") Signed-off-by: Ilan Tayari <ilant@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/xfrm/xfrm_user.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index ba74e5eeeeef..c4cceddac9db 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -595,9 +595,12 @@ static struct xfrm_state *xfrm_state_construct(struct net *net,
goto error;
}
- if (attrs[XFRMA_OFFLOAD_DEV] &&
- xfrm_dev_state_add(net, x, nla_data(attrs[XFRMA_OFFLOAD_DEV])))
- goto error;
+ if (attrs[XFRMA_OFFLOAD_DEV]) {
+ err = xfrm_dev_state_add(net, x,
+ nla_data(attrs[XFRMA_OFFLOAD_DEV]));
+ if (err)
+ goto error;
+ }
if ((err = xfrm_alloc_replay_state_esn(&x->replay_esn, &x->preplay_esn,
attrs[XFRMA_REPLAY_ESN_VAL])))