Skip to content

Commit

Permalink
iommu/omap: Fix debug_read_tlb() to use seq_printf()
Browse files Browse the repository at this point in the history
The debug_read_tlb() uses the sprintf() functions directly on the buffer
allocated by buf = kmalloc(count), without taking into account the size
of the buffer, with the consequence corrupting the heap, depending on
the count requested by the user.

The patch fixes the issue replacing sprintf() by seq_printf().

Signed-off-by: Salva Peiró <speirofr@gmail.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
  • Loading branch information
Salva Peiró authored and Joerg Roedel committed Aug 3, 2015
1 parent 5835b6a commit e203db2
Showing 1 changed file with 14 additions and 34 deletions.
48 changes: 14 additions & 34 deletions drivers/iommu/omap-iommu-debug.c
Original file line number Diff line number Diff line change
Expand Up @@ -133,67 +133,47 @@ __dump_tlb_entries(struct omap_iommu *obj, struct cr_regs *crs, int num)
}

static ssize_t iotlb_dump_cr(struct omap_iommu *obj, struct cr_regs *cr,
char *buf)
struct seq_file *s)
{
char *p = buf;

/* FIXME: Need more detail analysis of cam/ram */
p += sprintf(p, "%08x %08x %01x\n", cr->cam, cr->ram,
(cr->cam & MMU_CAM_P) ? 1 : 0);

return p - buf;
return seq_printf(s, "%08x %08x %01x\n", cr->cam, cr->ram,
(cr->cam & MMU_CAM_P) ? 1 : 0);
}

static size_t omap_dump_tlb_entries(struct omap_iommu *obj, char *buf,
ssize_t bytes)
static size_t omap_dump_tlb_entries(struct omap_iommu *obj, struct seq_file *s)
{
int i, num;
struct cr_regs *cr;
char *p = buf;

num = bytes / sizeof(*cr);
num = min(obj->nr_tlb_entries, num);
num = obj->nr_tlb_entries;

cr = kcalloc(num, sizeof(*cr), GFP_KERNEL);
if (!cr)
return 0;

num = __dump_tlb_entries(obj, cr, num);
for (i = 0; i < num; i++)
p += iotlb_dump_cr(obj, cr + i, p);
iotlb_dump_cr(obj, cr + i, s);
kfree(cr);

return p - buf;
return 0;
}

static ssize_t debug_read_tlb(struct file *file, char __user *userbuf,
size_t count, loff_t *ppos)
static int debug_read_tlb(struct seq_file *s, void *data)
{
struct omap_iommu *obj = file->private_data;
char *p, *buf;
ssize_t bytes, rest;
struct omap_iommu *obj = s->private;

if (is_omap_iommu_detached(obj))
return -EPERM;

buf = kmalloc(count, GFP_KERNEL);
if (!buf)
return -ENOMEM;
p = buf;

mutex_lock(&iommu_debug_lock);

p += sprintf(p, "%8s %8s\n", "cam:", "ram:");
p += sprintf(p, "-----------------------------------------\n");
rest = count - (p - buf);
p += omap_dump_tlb_entries(obj, p, rest);

bytes = simple_read_from_buffer(userbuf, count, ppos, buf, p - buf);
seq_printf(s, "%8s %8s\n", "cam:", "ram:");
seq_puts(s, "-----------------------------------------\n");
omap_dump_tlb_entries(obj, s);

mutex_unlock(&iommu_debug_lock);
kfree(buf);

return bytes;
return 0;
}

static void dump_ioptable(struct seq_file *s)
Expand Down Expand Up @@ -268,7 +248,7 @@ static int debug_read_pagetable(struct seq_file *s, void *data)
}

DEBUG_FOPS_RO(regs);
DEBUG_FOPS_RO(tlb);
DEBUG_SEQ_FOPS_RO(tlb);
DEBUG_SEQ_FOPS_RO(pagetable);

#define __DEBUG_ADD_FILE(attr, mode) \
Expand Down

0 comments on commit e203db2

Please sign in to comment.