Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

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

* 'fixes-v4.18-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  dh key: fix rounding up KDF output length
  certs/blacklist: fix const confusion
parents 3b41c3e2 3619dec5

certs/blacklist.h

+1 −1
Original line number Original line Diff line number Diff line 
#include <linux/kernel.h>

#include <linux/kernel.h>





extern const char __initdata *const blacklist_hashes[];
 
extern const char __initconst *const blacklist_hashes[];

security/keys/dh.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -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

 * 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

 * from DH and other info is an arbitrary string (see SP800-56A section

 * 5.8.1.2).

 * 5.8.1.2).

 *

 * 'dlen' must be a multiple of the digest size.

 */

 */

static int kdf_ctr(struct kdf_sdesc *sdesc, const u8 *src, unsigned int slen,

static int kdf_ctr(struct kdf_sdesc *sdesc, const u8 *src, unsigned int slen,

		   u8 *dst, unsigned int dlen, unsigned int zlen)

		   u8 *dst, unsigned int dlen, unsigned int zlen)
@@ -205,7 +207,7 @@ static int keyctl_dh_compute_kdf(struct kdf_sdesc *sdesc, 
{

{

	uint8_t *outbuf = NULL;

	uint8_t *outbuf = NULL;

	int ret;

	int ret;

	size_t outbuf_len = round_up(buflen,

	size_t outbuf_len = roundup(buflen,

				    crypto_shash_digestsize(sdesc->shash.tfm));

				    crypto_shash_digestsize(sdesc->shash.tfm));





	outbuf = kmalloc(outbuf_len, GFP_KERNEL);

	outbuf = kmalloc(outbuf_len, GFP_KERNEL);