mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-03 23:58:05 +00:00
Code Issues Releases Wiki Activity

IB/qib: Protect from buffer overflow in struct qib_user_sdma_pkt fields

Browse source 
Overflowing either addrlimit or bytes_togo can allow userspace to trigger
a buffer overflow of kernel memory. Check for overflows in all the places
doing math on user controlled buffers.

Fixes: f931551baf ("IB/qib: Add new qib driver for QLogic PCIe InfiniBand adapters")
Link: https://lore.kernel.org/r/20211012175519.7298.77738.stgit@awfm-01.cornelisnetworks.com
Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
Reviewed-by: Dennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>
Signed-off-by: Mike Marciniszyn <mike.marciniszyn@cornelisnetworks.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
This commit is contained in:
Mike Marciniszyn 2021-10-12 13:55:19 -04:00 committed by Jason Gunthorpe
parent 1ab52ac1e9
commit d39bf40e55
1 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
drivers/infiniband/hw/qib/qib_user_sdma.c
View file

@ -602,7 +602,7 @@ static int qib_user_sdma_coalesce(const struct qib_devdata *dd,
/* /*
* How many pages in this iovec element? * How many pages in this iovec element?
*/ */
static int qib_user_sdma_num_pages(const struct iovec *iov) static size_t qib_user_sdma_num_pages(const struct iovec *iov)
{ {
const unsigned long addr = (unsigned long) iov->iov_base; const unsigned long addr = (unsigned long) iov->iov_base;
const unsigned long len = iov->iov_len; const unsigned long len = iov->iov_len;
@ -658,7 +658,7 @@ static void qib_user_sdma_free_pkt_frag(struct device *dev,
static int qib_user_sdma_pin_pages(const struct qib_devdata *dd, static int qib_user_sdma_pin_pages(const struct qib_devdata *dd,
struct qib_user_sdma_queue *pq, struct qib_user_sdma_queue *pq,
struct qib_user_sdma_pkt *pkt, struct qib_user_sdma_pkt *pkt,
unsigned long addr, int tlen, int npages) unsigned long addr, int tlen, size_t npages)
{ {
struct page *pages[8]; struct page *pages[8];
int i, j; int i, j;
@ -722,7 +722,7 @@ static int qib_user_sdma_pin_pkt(const struct qib_devdata *dd,
unsigned long idx; unsigned long idx;
for (idx = 0; idx < niov; idx++) { for (idx = 0; idx < niov; idx++) {
const int npages = qib_user_sdma_num_pages(iov + idx); const size_t npages = qib_user_sdma_num_pages(iov + idx);
const unsigned long addr = (unsigned long) iov[idx].iov_base; const unsigned long addr = (unsigned long) iov[idx].iov_base;
ret = qib_user_sdma_pin_pages(dd, pq, pkt, addr, ret = qib_user_sdma_pin_pages(dd, pq, pkt, addr,
@ -824,8 +824,8 @@ static int qib_user_sdma_queue_pkts(const struct qib_devdata *dd,
unsigned pktnw; unsigned pktnw;
unsigned pktnwc; unsigned pktnwc;
int nfrags = 0; int nfrags = 0;
int npages = 0; size_t npages = 0;
int bytes_togo = 0; size_t bytes_togo = 0;
int tiddma = 0; int tiddma = 0;
int cfur; int cfur;
@ -885,7 +885,11 @@ static int qib_user_sdma_queue_pkts(const struct qib_devdata *dd,
npages += qib_user_sdma_num_pages(&iov[idx]); npages += qib_user_sdma_num_pages(&iov[idx]);
bytes_togo += slen; if (check_add_overflow(bytes_togo, slen, &bytes_togo) ||
bytes_togo > type_max(typeof(pkt->bytes_togo))) {
ret = -EINVAL;
goto free_pbc;
}
pktnwc += slen >> 2; pktnwc += slen >> 2;
idx++; idx++;
nfrags++; nfrags++;
@ -904,8 +908,7 @@ static int qib_user_sdma_queue_pkts(const struct qib_devdata *dd,
} }
if (frag_size) { if (frag_size) {
int tidsmsize, n; size_t tidsmsize, n, pktsize, sz, addrlimit;
size_t pktsize;
n = npages*((2*PAGE_SIZE/frag_size)+1); n = npages*((2*PAGE_SIZE/frag_size)+1);
pktsize = struct_size(pkt, addr, n); pktsize = struct_size(pkt, addr, n);
@ -923,14 +926,24 @@ static int qib_user_sdma_queue_pkts(const struct qib_devdata *dd,
else else
tidsmsize = 0; tidsmsize = 0;
pkt = kmalloc(pktsize+tidsmsize, GFP_KERNEL); if (check_add_overflow(pktsize, tidsmsize, &sz)) {
ret = -EINVAL;
goto free_pbc;
}
pkt = kmalloc(sz, GFP_KERNEL);
if (!pkt) { if (!pkt) {
ret = -ENOMEM; ret = -ENOMEM;
goto free_pbc; goto free_pbc;
} }
pkt->largepkt = 1; pkt->largepkt = 1;
pkt->frag_size = frag_size; pkt->frag_size = frag_size;
pkt->addrlimit = n + ARRAY_SIZE(pkt->addr); if (check_add_overflow(n, ARRAY_SIZE(pkt->addr),
&addrlimit) ||
addrlimit > type_max(typeof(pkt->addrlimit))) {
ret = -EINVAL;
goto free_pbc;
}
pkt->addrlimit = addrlimit;
if (tiddma) { if (tiddma) {
char *tidsm = (char *)pkt + pktsize; char *tidsm = (char *)pkt + pktsize;