[PATCH] ARM:kernel checking failure after call vmalloc
Chen Gang
gang.chen at asianux.com
Tue Jan 29 23:13:53 EST 2013
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 <gang.chen at asianux.com>
---
arch/arm/kernel/etm.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/arch/arm/kernel/etm.c b/arch/arm/kernel/etm.c
index 9b6de8c..fbe51a3 100644
--- a/arch/arm/kernel/etm.c
+++ b/arch/arm/kernel/etm.c
@@ -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++)
--
1.7.10.4
More information about the linux-arm-kernel
mailing list