nvme-tcp: fix a NULL deref when an admin connect times out

[linux.git] / block / blk.h

diff --git a/block/blk.h b/block/blk.h
index 5d636ee416630e09602c394be8c6b8042a276672..e27fd1512e4bb115befb3e3ef9aec68232145ca8 100644 (file)
--- a/block/blk.h
+++ b/block/blk.h
@@ -75,7 +75,7 @@ static inline bool biovec_phys_mergeable(struct request_queue *q,
 
        if (addr1 + vec1->bv_len != addr2)
                return false;
-       if (xen_domain() && !xen_biovec_phys_mergeable(vec1, vec2))
+       if (xen_domain() && !xen_biovec_phys_mergeable(vec1, vec2->bv_page))
                return false;
        if ((addr1 | mask) != ((addr2 + vec2->bv_len - 1) | mask))
                return false;