Commit eb0b947e authored by Mathias Krause's avatar Mathias Krause Committed by Sumit Semwal

dma-buf: propagate errors from dma_buf_describe() on debugfs read

The callback function dma_buf_describe() returns an int not void so the
function pointer cast in dma_buf_show() is wrong. dma_buf_describe() can
also fail when acquiring the mutex gets interrupted so always returning
0 in dma_buf_show() is wrong, too.

Fix both issues by avoiding the indirection via dma_buf_show() and call
dma_buf_describe() directly. Rename it to dma_buf_debug_show() to get it
in line with the other functions.

This type mismatch was caught by the PaX RAP plugin.
Signed-off-by: default avatarMathias Krause <>
Cc: Sumit Semwal <>
Cc: Daniel Vetter <>
Cc: Brad Spengler <>
Cc: PaX Team <>
Signed-off-by: default avatarSumit Semwal <>
parent 99681886
......@@ -824,7 +824,7 @@ void dma_buf_vunmap(struct dma_buf *dmabuf, void *vaddr)
static int dma_buf_describe(struct seq_file *s)
static int dma_buf_debug_show(struct seq_file *s, void *unused)
int ret;
struct dma_buf *buf_obj;
......@@ -879,17 +879,9 @@ static int dma_buf_describe(struct seq_file *s)
return 0;
static int dma_buf_show(struct seq_file *s, void *unused)
void (*func)(struct seq_file *) = s->private;
return 0;
static int dma_buf_debug_open(struct inode *inode, struct file *file)
return single_open(file, dma_buf_show, inode->i_private);
return single_open(file, dma_buf_debug_show, NULL);
static const struct file_operations dma_buf_debug_fops = {
......@@ -913,7 +905,7 @@ static int dma_buf_init_debugfs(void)
return err;
err = dma_buf_debugfs_create_file("bufinfo", dma_buf_describe);
err = dma_buf_debugfs_create_file("bufinfo", NULL);
if (err)
pr_debug("dma_buf: debugfs: failed to create node bufinfo\n");
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment