diff options
| author | Jakub Kicinski <jakub.kicinski@netronome.com> | 2019-06-04 00:16:58 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-06-04 23:33:50 +0200 |
| commit | da29e4b466e6916a52e0e2f60054f855c324a9c2 (patch) | |
| tree | 920af641fcecb8ac9956ded01c33df742c917add /net/strparser | |
| parent | net: mscc: ocelot: Fix some struct initializations (diff) | |
| download | linux-da29e4b466e6916a52e0e2f60054f855c324a9c2.tar.xz linux-da29e4b466e6916a52e0e2f60054f855c324a9c2.zip | |
net/tls: fully initialize the msg wrapper skb
If strparser gets cornered into starting a new message from
an sk_buff which already has frags, it will allocate a new
skb to become the "wrapper" around the fragments of the
message.
This new skb does not inherit any metadata fields. In case
of TLS offload this may lead to unnecessarily re-encrypting
the message, as skb->decrypted is not set for the wrapper skb.
Try to be conservative and copy all fields of old skb
strparser's user may reasonably need.
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Dirk van der Merwe <dirk.vandermerwe@netronome.com>
Reviewed-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/strparser')
| -rw-r--r-- | net/strparser/strparser.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/net/strparser/strparser.c b/net/strparser/strparser.c index e137698e8aef..3fe541b746b0 100644 --- a/net/strparser/strparser.c +++ b/net/strparser/strparser.c @@ -160,18 +160,14 @@ static int __strp_recv(read_descriptor_t *desc, struct sk_buff *orig_skb, return 0; } - skb = alloc_skb(0, GFP_ATOMIC); + skb = alloc_skb_for_msg(head); if (!skb) { STRP_STATS_INCR(strp->stats.mem_fail); desc->error = -ENOMEM; return 0; } - skb->len = head->len; - skb->data_len = head->len; - skb->truesize = head->truesize; - *_strp_msg(skb) = *_strp_msg(head); + strp->skb_nextp = &head->next; - skb_shinfo(skb)->frag_list = head; strp->skb_head = skb; head = skb; } else { |