Skip to contentSkip to conversation

ARM:kernel checking failure after call vmalloc

PATCH New Chen Gang 1 participant 1 message Jan 30, 2013 Arm (32-bit)

lore
Share & tools
lore

Chen Gang

author
#0 lore raw

PATCH 1/1 ARM:kernel checking failure after call vmalloc

need checking failure after call vmalloc.

if fail:
need return fail code (-ENOMEM, long will be signed cast to int) also need call etb_lock(t) to lock again.
better to let vmalloc code above etb_writel(... ETBR_READADDR).

Signed-off-by Chen Gang <[email protected]>
---
 arch/arm/kernel/etm.c |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
arch/arm/kernel/etm.c +9 -3
index 9b6de8c..fbe51a3 100644
@@ -287,14 +287,20 @@ static ssize_t etb_read(struct file *file, char __user *data,
 	etb_unlock(t);
 
 	total = etb_getdatalen(t);
+	length = min(total * 4, (int)len);
+
+	buf = vmalloc(length);
+	if (!buf) {
+		etb_lock(t);
+		length = -ENOMEM;
+		goto out;
+	}
+
 	if (total == t->etb_bufsz)
 		first = etb_readl(t, ETBR_WRITEADDR);
 
 	etb_writel(t, first, ETBR_READADDR);
 
-	length = min(total * 4, (int)len);
-	buf = vmalloc(length);
-
 	dev_dbg(t->dev, "ETB buffer length: %d\n", total);
 	dev_dbg(t->dev, "ETB status reg: %x\n", etb_readl(t, ETBR_STATUS));
 	for (i = 0; i < length / 4; i++)
Signature · 1 line
1.7.10.4