From: David Howells <dhowells@redhat.com>
Date: Tue, 2 Oct 2012 18:30:19 +0000 (+0100)
Subject: Merge branch 'modsign-keys-devel' into security-next-keys
X-Git-Tag: v3.8-rc1~90^2~4^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4442d7704c7311d1c42383d365e0b883e0075975;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge branch 'modsign-keys-devel' into security-next-keys

Signed-off-by: David Howells <dhowells@redhat.com>
---

4442d7704c7311d1c42383d365e0b883e0075975
diff --cc security/keys/trusted.c
index 3f163d0,42036c7..e13fcf7
--- a/security/keys/trusted.c
+++ b/security/keys/trusted.c
@@@ -903,9 -936,8 +904,9 @@@ static int trusted_instantiate(struct k
  	char *datablob;
  	int ret = 0;
  	int key_cmd;
 +	size_t key_len;
  
- 	if (datalen <= 0 || datalen > 32767 || !data)
+ 	if (datalen <= 0 || datalen > 32767 || !prep->data)
  		return -EINVAL;
  
  	datablob = kmalloc(datalen + 1, GFP_KERNEL);