kernel: bump 4.14 to 4.14.18
Refresh patches. Remove upstreamed patches: - apm821xx/010-crypto-gcm-add-GCM-IV-size-constant.patch - backport/040-crypto-fix-typo-in-KPP-dependency-of-CRYPTO_ECDH.patch Remove pending-4.14/650-pppoe_header_pad.patch, it is superseded by upstream commit d32e5740001972c1bb193dd60af02721d047a17e. Update patch that no longer applies: hack/204-module_strip.patch Compile-tested: octeon, x86/64. Runtime-tested: octeon, x86/64. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>v19.07.3_mercusys_ac12_duma
Stijn Tintel
6 years ago
parent
787326b43e
commit
3072908d0d
@ -1,27 +0,0 @@
|
||||
From ef780324592dd639e4bfbc5b9bf8934b234b7c99 Mon Sep 17 00:00:00 2001
|
||||
From: Corentin LABBE <clabbe.montjoie@gmail.com>
|
||||
Date: Tue, 22 Aug 2017 10:08:08 +0200
|
||||
Subject: [PATCH] crypto: gcm - add GCM IV size constant
|
||||
|
||||
Many GCM users use directly GCM IV size instead of using some constant.
|
||||
|
||||
This patch add all IV size constant used by GCM.
|
||||
|
||||
Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>
|
||||
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
|
||||
---
|
||||
include/crypto/gcm.h | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
create mode 100644 include/crypto/gcm.h
|
||||
|
||||
--- /dev/null
|
||||
+++ b/include/crypto/gcm.h
|
||||
@@ -0,0 +1,8 @@
|
||||
+#ifndef _CRYPTO_GCM_H
|
||||
+#define _CRYPTO_GCM_H
|
||||
+
|
||||
+#define GCM_AES_IV_SIZE 12
|
||||
+#define GCM_RFC4106_IV_SIZE 8
|
||||
+#define GCM_RFC4543_IV_SIZE 8
|
||||
+
|
||||
+#endif
|
||||
@ -1,25 +0,0 @@
|
||||
From 4b05f09db650d215632da97f2c25ceba8235102a Mon Sep 17 00:00:00 2001
|
||||
From: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
Date: Sun, 26 Nov 2017 00:09:45 +0100
|
||||
Subject: [PATCH] crypto: fix typo in KPP dependency of CRYPTO_ECDH
|
||||
|
||||
This fixes a typo in the CRYPTO_KPP dependency of CRYPTO_ECDH.
|
||||
|
||||
Fixes: 3c4b23901a0c ("crypto: ecdh - Add ECDH software support")
|
||||
Cc: <stable@vger.kernel.org> # v4.8+
|
||||
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
---
|
||||
crypto/Kconfig | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/crypto/Kconfig
|
||||
+++ b/crypto/Kconfig
|
||||
@@ -130,7 +130,7 @@ config CRYPTO_DH
|
||||
|
||||
config CRYPTO_ECDH
|
||||
tristate "ECDH algorithm"
|
||||
- select CRYTPO_KPP
|
||||
+ select CRYPTO_KPP
|
||||
select CRYPTO_RNG_DEFAULT
|
||||
help
|
||||
Generic implementation of the ECDH algorithm
|
||||
@ -1,29 +0,0 @@
|
||||
From: Felix Fietkau <nbd@nbd.name>
|
||||
Subject: pppoe: add extra padding for the header (useful for drivers that need headroom)
|
||||
|
||||
lede-commit 6517a757ec711fc3354b857e273e2621042f3c7a
|
||||
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
---
|
||||
drivers/net/ppp/pppoe.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
--- a/drivers/net/ppp/pppoe.c
|
||||
+++ b/drivers/net/ppp/pppoe.c
|
||||
@@ -861,7 +861,7 @@ static int pppoe_sendmsg(struct socket *
|
||||
goto end;
|
||||
|
||||
|
||||
- skb = sock_wmalloc(sk, total_len + dev->hard_header_len + 32,
|
||||
+ skb = sock_wmalloc(sk, total_len + dev->hard_header_len + 32 + NET_SKB_PAD,
|
||||
0, GFP_KERNEL);
|
||||
if (!skb) {
|
||||
error = -ENOMEM;
|
||||
@@ -869,7 +869,7 @@ static int pppoe_sendmsg(struct socket *
|
||||
}
|
||||
|
||||
/* Reserve space for headers. */
|
||||
- skb_reserve(skb, dev->hard_header_len);
|
||||
+ skb_reserve(skb, dev->hard_header_len + NET_SKB_PAD);
|
||||
skb_reset_network_header(skb);
|
||||
|
||||
skb->dev = dev;
|
||||
Loading…
Reference in New Issue