Commit 896a3492 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes-v4.18-rc3' of...

Merge branch 'fixes-v4.18-rc3' of git://

Pull more security subsystem fixes from James Morris:
 "Two further fixes for the keys subsystem"

* 'fixes-v4.18-rc3' of git://
  dh key: fix rounding up KDF output length
  certs/blacklist: fix const confusion
parents 3b41c3e2 3619dec5
#include <linux/kernel.h>
extern const char __initdata *const blacklist_hashes[];
extern const char __initconst *const blacklist_hashes[];
......@@ -142,6 +142,8 @@ static void kdf_dealloc(struct kdf_sdesc *sdesc)
* The src pointer is defined as Z || other info where Z is the shared secret
* from DH and other info is an arbitrary string (see SP800-56A section
* 'dlen' must be a multiple of the digest size.
static int kdf_ctr(struct kdf_sdesc *sdesc, const u8 *src, unsigned int slen,
u8 *dst, unsigned int dlen, unsigned int zlen)
......@@ -205,8 +207,8 @@ static int keyctl_dh_compute_kdf(struct kdf_sdesc *sdesc,
uint8_t *outbuf = NULL;
int ret;
size_t outbuf_len = round_up(buflen,
size_t outbuf_len = roundup(buflen,
outbuf = kmalloc(outbuf_len, GFP_KERNEL);
if (!outbuf) {
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment