diff options
| author |   Dave Watson <davejwatson@fb.com> | 2018-03-26 12:31:21 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-03-27 11:00:18 -0400 |
| commit | cd00edc179863848abab5cc5683de5b7b5f70954 (patch) | |
| tree | c11ac851909a6456a87b4308b26963fbf0ecd2bf /net/strparser | |
| parent | net sched actions: fix dumping which requires several messages to user space (diff) | |
| download | linux-dev-cd00edc179863848abab5cc5683de5b7b5f70954.tar.xz linux-dev-cd00edc179863848abab5cc5683de5b7b5f70954.zip | |
strparser: Fix sign of err codes
strp_parser_err is called with a negative code everywhere, which then
calls abort_parser with a negative code. strp_msg_timeout calls
abort_parser directly with a positive code. Negate ETIMEDOUT
to match signed-ness of other calls.
The default abort_parser callback, strp_abort_strp, sets
sk->sk_err to err. Also negate the error here so sk_err always
holds a positive value, as the rest of the net code expects. Currently
a negative sk_err can result in endless loops, or user code that
thinks it actually sent/received err bytes.
Found while testing net/tls_sw recv path.
Fixes: 43a0c6751a322847 ("strparser: Stream parser for messages")
Signed-off-by: Dave Watson <davejwatson@fb.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/strparser')
| -rw-r--r-- | net/strparser/strparser.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/strparser/strparser.c b/net/strparser/strparser.c index 1fdab5c4eda8..b9283ce5cd85 100644 --- a/net/strparser/strparser.c +++ b/net/strparser/strparser.c @@ -60,7 +60,7 @@ static void strp_abort_strp(struct strparser *strp, int err) struct sock *sk = strp->sk; /* Report an error on the lower socket */ - sk->sk_err = err; + sk->sk_err = -err; sk->sk_error_report(sk); } } @@ -458,7 +458,7 @@ static void strp_msg_timeout(struct work_struct *w) /* Message assembly timed out */ STRP_STATS_INCR(strp->stats.msg_timeouts); strp->cb.lock(strp); - strp->cb.abort_parser(strp, ETIMEDOUT); + strp->cb.abort_parser(strp, -ETIMEDOUT); strp->cb.unlock(strp); } |