diff options
| author |   Ilan Tayari <ilant@mellanox.com> | 2017-04-30 16:34:38 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-05-01 14:58:50 -0400 |
| commit | 67d349ed603d5ce4a6f1722b1736e2bcef0e8690 (patch) | |
| tree | 21e78406f0e8486ea8ccee0baa9adc4d7d93fe92 /net/ipv4/esp4.c | |
| parent | ip6_tunnel: Fix missing tunnel encapsulation limit option (diff) | |
| download | linux-dev-67d349ed603d5ce4a6f1722b1736e2bcef0e8690.tar.xz linux-dev-67d349ed603d5ce4a6f1722b1736e2bcef0e8690.zip | |
net/esp4: Fix invalid esph pointer crash
Both esp_output and esp_xmit take a pointer to the ESP header
and place it in esp_info struct prior to calling esp_output_head.
Inside esp_output_head, the call to esp_output_udp_encap
makes sure to update the pointer if it gets invalid.
However, if esp_output_head itself calls skb_cow_data, the
pointer is not updated and stays invalid, causing a crash
after esp_output_head returns.
Update the pointer if it becomes invalid in esp_output_head
Fixes: fca11ebde3f0 ("esp4: Reorganize esp_output")
Signed-off-by: Ilan Tayari <ilant@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/esp4.c')
| -rw-r--r-- | net/ipv4/esp4.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c index 7f2caf71212b..65cc02bd82bc 100644 --- a/net/ipv4/esp4.c +++ b/net/ipv4/esp4.c @@ -317,6 +317,7 @@ cow: if (nfrags < 0) goto out; tail = skb_tail_pointer(trailer); + esp->esph = ip_esp_hdr(skb); skip_cow: esp_output_fill_trailer(tail, esp->tfclen, esp->plen, esp->proto); |