Commit a280ef90 authored by Dan Carpenter's avatar Dan Carpenter Committed by Jakub Kicinski

octeontx2-af: debugfs: don't corrupt user memory

The user supplies the "count" value to say how big its read buffer is.
The rvu_dbg_lmtst_map_table_display() function does not take the "count"
into account but instead just copies the whole table, potentially
corrupting the user's data.

Introduce the "ret" variable to store how many bytes we can copy.  Also
I changed the type of "off" to size_t to make using min() simpler.

Fixes: 0daa55d0 ("octeontx2-af: cn10k: debugfs for dumping LMTST map table")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Link: https://lore.kernel.org/r/20211117073454.GD5237@kiliSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 48b71a9e
...@@ -236,10 +236,11 @@ static ssize_t rvu_dbg_lmtst_map_table_display(struct file *filp, ...@@ -236,10 +236,11 @@ static ssize_t rvu_dbg_lmtst_map_table_display(struct file *filp,
u64 lmt_addr, val, tbl_base; u64 lmt_addr, val, tbl_base;
int pf, vf, num_vfs, hw_vfs; int pf, vf, num_vfs, hw_vfs;
void __iomem *lmt_map_base; void __iomem *lmt_map_base;
int index = 0, off = 0;
int bytes_not_copied;
int buf_size = 10240; int buf_size = 10240;
size_t off = 0;
int index = 0;
char *buf; char *buf;
int ret;
/* don't allow partial reads */ /* don't allow partial reads */
if (*ppos != 0) if (*ppos != 0)
...@@ -303,15 +304,17 @@ static ssize_t rvu_dbg_lmtst_map_table_display(struct file *filp, ...@@ -303,15 +304,17 @@ static ssize_t rvu_dbg_lmtst_map_table_display(struct file *filp,
} }
off += scnprintf(&buf[off], buf_size - 1 - off, "\n"); off += scnprintf(&buf[off], buf_size - 1 - off, "\n");
bytes_not_copied = copy_to_user(buffer, buf, off); ret = min(off, count);
if (copy_to_user(buffer, buf, ret))
ret = -EFAULT;
kfree(buf); kfree(buf);
iounmap(lmt_map_base); iounmap(lmt_map_base);
if (bytes_not_copied) if (ret < 0)
return -EFAULT; return ret;
*ppos = off; *ppos = ret;
return off; return ret;
} }
RVU_DEBUG_FOPS(lmtst_map_table, lmtst_map_table_display, NULL); RVU_DEBUG_FOPS(lmtst_map_table, lmtst_map_table_display, NULL);
......
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