eCryptfs: Use skcipher and shash (d1558f4e) · Commits · 戴 / test

eCryptfs: Fix null pointer dereference on kzalloc error path The conversion to skcipher and shash added a couple of null pointer dereference bugs on the kzalloc failure path. This patch fixes them. Fixes: ("eCryptfs: Use skcipher and shash") Reported-by:

Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by:

Herbert Xu <herbert@gondor.apana.org.au>

fs/ecryptfs/keystore.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -635,8 +635,7 @@ ecryptfs_write_tag_70_packet(char dest, size_t remaining_bytes,
		if (!s) {
		printk(KERN_ERR "%s: Out of memory whilst trying to kmalloc "
		"[%zd] bytes of kernel memory\n", __func__, sizeof(*s));
		rc = -ENOMEM;
		goto out;
		return -ENOMEM;
		}
		(*packet_size) = 0;
		rc = ecryptfs_find_auth_tok_for_sig(
		@@ -922,8 +921,7 @@ ecryptfs_parse_tag_70_packet(char *filename, size_t filename_size,
		if (!s) {
		printk(KERN_ERR "%s: Out of memory whilst trying to kmalloc "
		"[%zd] bytes of kernel memory\n", __func__, sizeof(*s));
		rc = -ENOMEM;
		goto out;
		return -ENOMEM;
		}
		if (max_packet_size < ECRYPTFS_TAG_70_MIN_METADATA_SIZE) {
		printk(KERN_WARNING "%s: max_packet_size is [%zd]; it must be "

Admin message