]>
Commit | Line | Data |
---|---|---|
7a674766 GKH |
1 | From 800cb192403a75817ecb9123aaff12340715fdc7 Mon Sep 17 00:00:00 2001 |
2 | From: Guillaume Nault <g.nault@alphalink.fr> | |
3 | Date: Wed, 12 Jun 2013 16:07:36 +0200 | |
4 | Subject: l2tp: Fix sendmsg() return value | |
5 | ||
6 | From: Guillaume Nault <g.nault@alphalink.fr> | |
7 | ||
8 | [ Upstream commit a6f79d0f26704214b5b702bbac525cb72997f984 ] | |
9 | ||
10 | PPPoL2TP sockets should comply with the standard send*() return values | |
11 | (i.e. return number of bytes sent instead of 0 upon success). | |
12 | ||
13 | Signed-off-by: Guillaume Nault <g.nault@alphalink.fr> | |
14 | Signed-off-by: David S. Miller <davem@davemloft.net> | |
15 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
16 | --- | |
17 | net/l2tp/l2tp_ppp.c | 2 +- | |
18 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
19 | ||
20 | --- a/net/l2tp/l2tp_ppp.c | |
21 | +++ b/net/l2tp/l2tp_ppp.c | |
22 | @@ -362,7 +362,7 @@ static int pppol2tp_sendmsg(struct kiocb | |
23 | sock_put(ps->tunnel_sock); | |
24 | sock_put(sk); | |
25 | ||
26 | - return error; | |
27 | + return total_len; | |
28 | ||
29 | error_put_sess_tun: | |
30 | sock_put(ps->tunnel_sock); |