linux-stable.git/net/ipv4/esp4.c, branch linux-4.4.y

ipsec: check return value of skb_to_sgvec always

2018-04-13T17:50:23+00:00

commit 3f29770723fe498a5c5f57c3a31a996ebdde03e1 upstream.

Signed-off-by: Jason A. Donenfeld 
Cc: Steffen Klassert 
Cc: Herbert Xu 
Cc: "David S. Miller" 
Signed-off-by: David S. Miller 
[natechancellor: Adjusted context due to lack of fca11ebde3f0]
Signed-off-by: Nathan Chancellor 
Signed-off-by: Greg Kroah-Hartman

esp4: Fix integrity verification when ESN are used

2016-12-10T18:07:26+00:00

commit 7c7fedd51c02f4418e8b2eed64bdab601f882aa4 upstream.

When handling inbound packets, the two halves of the sequence number
stored on the skb are already in network order.

Fixes: 7021b2e1cddd ("esp4: Switch to new AEAD interface")
Signed-off-by: Tobias Brunner 
Acked-by: Herbert Xu 
Signed-off-by: Steffen Klassert 
Signed-off-by: Greg Kroah-Hartman

esp: Fix ESN generation under UDP encapsulation

2016-07-11T16:31:11+00:00

[ Upstream commit 962fcef33b03395051367181a0549d29d109d9a4 ]

Blair Steven noticed that ESN in conjunction with UDP encapsulation
is broken because we set the temporary ESP header to the wrong spot.

This patch fixes this by first of all using the right spot, i.e.,
4 bytes off the real ESP header, and then saving this information
so that after encryption we can restore it properly.

Fixes: 7021b2e1cddd ("esp4: Switch to new AEAD interface")
Reported-by: Blair Steven 
Signed-off-by: Herbert Xu 
Acked-by: Steffen Klassert 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

esp4: Switch to new AEAD interface

2015-05-28T03:23:20+00:00

This patch makes use of the new AEAD interface which uses a single
SG list instead of separate lists for the AD and plain text.  The
IV generation is also now carried out through normal AEAD methods.

Signed-off-by: Herbert Xu

ipv4: coding style: comparison for equality with NULL

2015-04-03T16:11:15+00:00

The ipv4 code uses a mixture of coding styles. In some instances check
for NULL pointer is done as x == NULL and sometimes as !x. !x is
preferred according to checkpatch and this patch makes the code
consistent by adopting the latter form.

No changes detected by objdiff.

Signed-off-by: Ian Morris 
Signed-off-by: David S. Miller

net: esp: Convert NETDEBUG to pr_info

2014-11-06T20:11:10+00:00

Commit 64ce207306de ("[NET]: Make NETDEBUG pure printk wrappers")
originally had these NETDEBUG printks as always emitting.

Commit a2a316fd068c ("[NET]: Replace CONFIG_NET_DEBUG with sysctl")
added a net_msg_warn sysctl to these NETDEBUG uses.

Convert these NETDEBUG uses to normal pr_info calls.

This changes the output prefix from "ESP: " to include
"IPSec: " for the ipv4 case and "IPv6: " for the ipv6 case.

These output lines are now like the other messages in the files.

Other miscellanea:

Neaten the arithmetic spacing to be consistent with other
arithmetic spacing in the files.

Signed-off-by: Joe Perches 
Signed-off-by: David S. Miller

esp4: remove assignment in if condition

2014-11-04T21:57:49+00:00

Signed-off-by: Fabian Frederick 
Signed-off-by: David S. Miller

esp4: Use the IPsec protocol multiplexer API

2014-02-25T06:04:17+00:00

Switch esp4 to use the new IPsec protocol multiplexer.

Signed-off-by: Steffen Klassert

net: esp{4,6}: get rid of struct esp_data

2013-10-29T05:39:42+00:00

struct esp_data consists of a single pointer, vanishing the need for it
to be a structure. Fold the pointer into 'data' direcly, removing one
level of pointer indirection.

Signed-off-by: Mathias Krause 
Cc: Steffen Klassert 
Cc: Herbert Xu 
Cc: "David S. Miller" 
Signed-off-by: Steffen Klassert

net: esp{4,6}: remove padlen from struct esp_data

2013-10-29T05:39:42+00:00

The padlen member of struct esp_data is always zero. Get rid of it.

Signed-off-by: Mathias Krause 
Cc: Steffen Klassert 
Cc: Herbert Xu 
Cc: "David S. Miller" 
Signed-off-by: Steffen Klassert