diff options
author | Doron Roberts-Kedes <doronrk@fb.com> | 2018-04-11 15:05:16 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-04-12 21:54:59 -0400 |
commit | 9d0c75bf6e03d9bf80c55b0f677dc9b982958fd5 (patch) | |
tree | bb0a065e70bb7331987e4759f216ba24db4949a0 /net/netfilter/xt_connlimit.c | |
parent | 5ff9c1a3dd92d2d8eeea6bb15b3502cfcc0e26fa (diff) |
strparser: Fix incorrect strp->need_bytes value.
strp_data_ready resets strp->need_bytes to 0 if strp_peek_len indicates
that the remainder of the message has been received. However,
do_strp_work does not reset strp->need_bytes to 0. If do_strp_work
completes a partial message, the value of strp->need_bytes will continue
to reflect the needed bytes of the previous message, causing
future invocations of strp_data_ready to return early if
strp->need_bytes is less than strp_peek_len. Resetting strp->need_bytes
to 0 in __strp_recv on handing a full message to the upper layer solves
this problem.
__strp_recv also calculates strp->need_bytes using stm->accum_len before
stm->accum_len has been incremented by cand_len. This can cause
strp->need_bytes to be equal to the full length of the message instead
of the full length minus the accumulated length. This, in turn, causes
strp_data_ready to return early, even when there is sufficient data to
complete the partial message. Incrementing stm->accum_len before using
it to calculate strp->need_bytes solves this problem.
Found while testing net/tls_sw recv path.
Fixes: 43a0c6751a322847 ("strparser: Stream parser for messages")
Signed-off-by: Doron Roberts-Kedes <doronrk@fb.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/xt_connlimit.c')
0 files changed, 0 insertions, 0 deletions