diff for duplicates of <20150711222055.GA11708@mwanda> diff --git a/a/1.txt b/N1/1.txt index 40c8e8d..f9b988f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -14,9 +14,14 @@ index 880d0d6..7d50711 100644 while (dc != dp) { - BUG_ON(gop - queue->tx_unmap_ops > MAX_PENDING_REQS); + BUG_ON(gop - queue->tx_unmap_ops >= MAX_PENDING_REQS); - pending_idx queue->dealloc_ring[pending_index(dc++)]; + pending_idx = + queue->dealloc_ring[pending_index(dc++)]; -- pending_idx_release[gop-queue->tx_unmap_ops] + pending_idx_release[gop - queue->tx_unmap_ops] pending_idx; -- queue->pages_to_unmap[gop-queue->tx_unmap_ops] + queue->pages_to_unmap[gop - queue->tx_unmap_ops] queue->mmap_pages[pending_idx]; +- pending_idx_release[gop-queue->tx_unmap_ops] = ++ pending_idx_release[gop - queue->tx_unmap_ops] = + pending_idx; +- queue->pages_to_unmap[gop-queue->tx_unmap_ops] = ++ queue->pages_to_unmap[gop - queue->tx_unmap_ops] = + queue->mmap_pages[pending_idx]; gnttab_set_unmap_op(gop, idx_to_kaddr(queue, pending_idx), diff --git a/a/content_digest b/N1/content_digest index 5dc6fb7..3a56376 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Subject\0[patch] net/xen-netback: off by one in BUG_ON() condition\0" - "Date\0Sat, 11 Jul 2015 22:20:55 +0000\0" + "Date\0Sun, 12 Jul 2015 01:20:55 +0300\0" "To\0Ian Campbell <ian.campbell@citrix.com>" " Zoltan Kiss <zoltan.kiss@citrix.com>\0" "Cc\0Wei Liu <wei.liu2@citrix.com>" @@ -25,11 +25,16 @@ " \t\twhile (dc != dp) {\n" "-\t\t\tBUG_ON(gop - queue->tx_unmap_ops > MAX_PENDING_REQS);\n" "+\t\t\tBUG_ON(gop - queue->tx_unmap_ops >= MAX_PENDING_REQS);\n" - " \t\t\tpending_idx \t\t\t\tqueue->dealloc_ring[pending_index(dc++)];\n" + " \t\t\tpending_idx =\n" + " \t\t\t\tqueue->dealloc_ring[pending_index(dc++)];\n" " \n" - "-\t\t\tpending_idx_release[gop-queue->tx_unmap_ops] +\t\t\tpending_idx_release[gop - queue->tx_unmap_ops] \t\t\t\tpending_idx;\n" - "-\t\t\tqueue->pages_to_unmap[gop-queue->tx_unmap_ops] +\t\t\tqueue->pages_to_unmap[gop - queue->tx_unmap_ops] \t\t\t\tqueue->mmap_pages[pending_idx];\n" + "-\t\t\tpending_idx_release[gop-queue->tx_unmap_ops] =\n" + "+\t\t\tpending_idx_release[gop - queue->tx_unmap_ops] =\n" + " \t\t\t\tpending_idx;\n" + "-\t\t\tqueue->pages_to_unmap[gop-queue->tx_unmap_ops] =\n" + "+\t\t\tqueue->pages_to_unmap[gop - queue->tx_unmap_ops] =\n" + " \t\t\t\tqueue->mmap_pages[pending_idx];\n" " \t\t\tgnttab_set_unmap_op(gop,\n" " \t\t\t\t\t idx_to_kaddr(queue, pending_idx)," -7ac7cc39e17dcb5e56e9ecfd09cd3d8bf41038ee015a7a6ae1719f61881805b1 +5b3cc27e1300ba4f17271460b4d7e5264690c21565d1a900ffd8889c47c4c11e
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.