diff options
author | Dominik Sliwa <dominik.sliwa@toradex.com> | 2019-02-21 10:18:45 +0100 |
---|---|---|
committer | Dominik Sliwa <dominik.sliwa@toradex.com> | 2019-02-21 10:23:44 +0100 |
commit | e7720369ef69376d1244b49373e34663eaa6b5a1 (patch) | |
tree | c38343b848fec5c4975f0191ee4fed1d802c185a /patches | |
parent | 0bdb080c70495ea4efbed7661b4fe6100bd5adde (diff) |
Fix patches against 4.19.24
Signed-off-by: Dominik Sliwa <dominik.sliwa@toradex.com>
Diffstat (limited to 'patches')
-rw-r--r-- | patches/0025-usb-sg/usbnet.patch | 2 | ||||
-rw-r--r-- | patches/verify.patch | 16 |
2 files changed, 6 insertions, 12 deletions
diff --git a/patches/0025-usb-sg/usbnet.patch b/patches/0025-usb-sg/usbnet.patch index cab07250..1b9518cc 100644 --- a/patches/0025-usb-sg/usbnet.patch +++ b/patches/0025-usb-sg/usbnet.patch @@ -58,9 +58,9 @@ +#if LINUX_VERSION_IS_GEQ(3,35,0) kfree(entry->urb->sg); +#endif - /* fall through */ case rx_cleanup: usb_free_urb (entry->urb); + dev_kfree_skb (skb); @@ -1894,7 +1912,9 @@ int usbnet_resume (struct usb_interface retval = usb_submit_urb(res, GFP_ATOMIC); if (retval < 0) { diff --git a/patches/verify.patch b/patches/verify.patch index d52b7ce4..ccc08a78 100644 --- a/patches/verify.patch +++ b/patches/verify.patch @@ -64,7 +64,7 @@ struct x509_certificate *signer; /* Certificate that signed this one */ --- a/include/crypto/backport-public_key.h +++ b/include/crypto/backport-public_key.h -@@ -50,34 +50,6 @@ extern void public_key_signature_free(st +@@ -46,27 +46,6 @@ extern void public_key_signature_free(st extern struct asymmetric_key_subtype public_key_subtype; @@ -87,15 +87,9 @@ - const union key_payload *payload, - struct key *trusted); - --extern int query_asymmetric_key(const struct kernel_pkey_params *, -- struct kernel_pkey_query *); -- --extern int encrypt_blob(struct kernel_pkey_params *, const void *, void *); --extern int decrypt_blob(struct kernel_pkey_params *, const void *, void *); --extern int create_signature(struct kernel_pkey_params *, const void *, void *); --extern int verify_signature(const struct key *, -- const struct public_key_signature *); -- +-extern int verify_signature(const struct key *key, +- const struct public_key_signature *sig); + int public_key_verify_signature(const struct public_key *pkey, const struct public_key_signature *sig); - + |