From: Tom Herbert <tom@quantonium.net>
To: Dave Watson <davejwatson@fb.com>
Cc: "David S. Miller" <davem@davemloft.net>,
Linux Kernel Network Developers <netdev@vger.kernel.org>
Subject: Re: [PATCH net] strparser: Fix sign of err codes
Date: Mon, 26 Mar 2018 13:44:44 -0700 [thread overview]
Message-ID: <CAPDqMeorZEfUsjtaVy_NKVG=mfXnDhSad486PfHHckGucP0msg@mail.gmail.com> (raw)
In-Reply-To: <20180326193121.GA78356@davejwatson-mba.local>
On Mon, Mar 26, 2018 at 12:31 PM, Dave Watson <davejwatson@fb.com> wrote:
> 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.
>
Nice catch!
It might be nice to have a comment at strp_parser_err and abort_parser
description in Documentation/networking/strparser.txt should also be
updated that err is a negative error value.
Tom
> Fixes: 43a0c6751a322847 ("strparser: Stream parser for messages")
> Signed-off-by: Dave Watson <davejwatson@fb.com>
> ---
> net/strparser/strparser.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/net/strparser/strparser.c b/net/strparser/strparser.c
> index 1fdab5c..b9283ce 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);
> }
>
> --
> 2.9.5
>
next prev parent reply other threads:[~2018-03-26 20:44 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-26 19:31 [PATCH net] strparser: Fix sign of err codes Dave Watson
2018-03-26 20:44 ` Tom Herbert [this message]
2018-03-27 15:05 ` Dave Watson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAPDqMeorZEfUsjtaVy_NKVG=mfXnDhSad486PfHHckGucP0msg@mail.gmail.com' \
--to=tom@quantonium.net \
--cc=davejwatson@fb.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).