leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/testing'

Browse Source 
Sabrina Dubroca says:

====================
xfrm: a few fixes for espintc

Andrew Cagney reported some issues when trying to use async operations
on the encapsulation socket. Patches 1 and 2 take care of these bugs.

In addition, I missed a spot when adding IPv6 support and converting
to the common config option.
====================

Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
This commit is contained in:
Steffen Klassert
2020-07-21 08:03:04 +02:00
parent 17175d1a27 95a35b42bc
commit 0a266f8954
2 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
net/xfrm/espintcp.c
View File

@@ -109,8 +109,11 @@ static int espintcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
flags |= nonblock ? MSG_DONTWAIT : 0; flags |= nonblock ? MSG_DONTWAIT : 0;
skb = __skb_recv_datagram(sk, &ctx->ike_queue, flags, &off, &err); skb = __skb_recv_datagram(sk, &ctx->ike_queue, flags, &off, &err);
if (!skb) if (!skb) {
if (err == -EAGAIN && sk->sk_shutdown & RCV_SHUTDOWN)
return 0;
return err; return err;
}
copied = len; copied = len;
if (copied > skb->len) if (copied > skb->len)
@@ -213,7 +216,7 @@ retry:
return 0; return 0;
} }
static int espintcp_push_msgs(struct sock *sk) static int espintcp_push_msgs(struct sock *sk, int flags)
{ {
struct espintcp_ctx *ctx = espintcp_getctx(sk); struct espintcp_ctx *ctx = espintcp_getctx(sk);
struct espintcp_msg *emsg = &ctx->partial; struct espintcp_msg *emsg = &ctx->partial;
@@ -227,12 +230,12 @@ static int espintcp_push_msgs(struct sock *sk)
ctx->tx_running = 1; ctx->tx_running = 1;
if (emsg->skb) if (emsg->skb)
err = espintcp_sendskb_locked(sk, emsg, 0); err = espintcp_sendskb_locked(sk, emsg, flags);
else else
err = espintcp_sendskmsg_locked(sk, emsg, 0); err = espintcp_sendskmsg_locked(sk, emsg, flags);
if (err == -EAGAIN) { if (err == -EAGAIN) {
ctx->tx_running = 0; ctx->tx_running = 0;
return 0; return flags & MSG_DONTWAIT ? -EAGAIN : 0;
} }
if (!err) if (!err)
memset(emsg, 0, sizeof(*emsg)); memset(emsg, 0, sizeof(*emsg));
@@ -257,7 +260,7 @@ int espintcp_push_skb(struct sock *sk, struct sk_buff *skb)
offset = skb_transport_offset(skb); offset = skb_transport_offset(skb);
len = skb->len - offset; len = skb->len - offset;
espintcp_push_msgs(sk); espintcp_push_msgs(sk, 0);
if (emsg->len) { if (emsg->len) {
kfree_skb(skb); kfree_skb(skb);
@@ -270,7 +273,7 @@ int espintcp_push_skb(struct sock *sk, struct sk_buff *skb)
emsg->len = len; emsg->len = len;
emsg->skb = skb; emsg->skb = skb;
espintcp_push_msgs(sk); espintcp_push_msgs(sk, 0);
return 0; return 0;
} }
@@ -287,7 +290,7 @@ static int espintcp_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)
char buf[2] = {0}; char buf[2] = {0};
int err, end; int err, end;
if (msg->msg_flags) if (msg->msg_flags & ~MSG_DONTWAIT)
return -EOPNOTSUPP; return -EOPNOTSUPP;
if (size > MAX_ESPINTCP_MSG) if (size > MAX_ESPINTCP_MSG)
@@ -298,9 +301,10 @@ static int espintcp_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)
lock_sock(sk); lock_sock(sk);
err = espintcp_push_msgs(sk); err = espintcp_push_msgs(sk, msg->msg_flags & MSG_DONTWAIT);
if (err < 0) { if (err < 0) {
err = -ENOBUFS; if (err != -EAGAIN || !(msg->msg_flags & MSG_DONTWAIT))
err = -ENOBUFS;
goto unlock; goto unlock;
} }
@@ -337,10 +341,9 @@ static int espintcp_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)
tcp_rate_check_app_limited(sk); tcp_rate_check_app_limited(sk);
err = espintcp_push_msgs(sk); err = espintcp_push_msgs(sk, msg->msg_flags & MSG_DONTWAIT);
/* this message could be partially sent, keep it */ /* this message could be partially sent, keep it */
if (err < 0)
goto unlock;
release_sock(sk); release_sock(sk);
return size; return size;
@@ -374,7 +377,7 @@ static void espintcp_tx_work(struct work_struct *work)
lock_sock(sk); lock_sock(sk);
if (!ctx->tx_running) if (!ctx->tx_running)
espintcp_push_msgs(sk); espintcp_push_msgs(sk, 0);
release_sock(sk); release_sock(sk);
} }

4
net/xfrm/xfrm_policy.c
View File

@@ -39,7 +39,7 @@
#ifdef CONFIG_XFRM_STATISTICS #ifdef CONFIG_XFRM_STATISTICS
#include <net/snmp.h> #include <net/snmp.h>
#endif #endif
#ifdef CONFIG_INET_ESPINTCP #ifdef CONFIG_XFRM_ESPINTCP
#include <net/espintcp.h> #include <net/espintcp.h>
#endif #endif
@@ -4149,7 +4149,7 @@ void __init xfrm_init(void)
seqcount_init(&xfrm_policy_hash_generation); seqcount_init(&xfrm_policy_hash_generation);
xfrm_input_init(); xfrm_input_init();
#ifdef CONFIG_INET_ESPINTCP #ifdef CONFIG_XFRM_ESPINTCP
espintcp_init(); espintcp_init();
#endif #endif