]> www.infradead.org Git - nvme.git/commitdiff
nvme-tcp: memset scatterlist before sg_init_marker it nvme-5.16
authorJackie Liu <liuyun01@kylinos.cn>
Mon, 20 Dec 2021 02:54:39 +0000 (10:54 +0800)
committerChristoph Hellwig <hch@lst.de>
Tue, 21 Dec 2021 09:09:50 +0000 (10:09 +0100)
sg_init_marker's sg need initialized, otherwise report:

[...]
In file included from ../include/linux/dma-mapping.h:10,
                 from ../include/linux/skbuff.h:31,
                 from ../include/net/net_namespace.h:39,
                 from ../include/linux/netdevice.h:37,
                 from ../include/net/sock.h:46,
                 from ../drivers/nvme/host/tcp.c:12:
../drivers/nvme/host/tcp.c: In function ‘nvme_tcp_ddgst_update’:
../include/linux/scatterlist.h:214:16: error: ‘sg.page_link’ is used uninitialized in this function [-Werror=uninitialized]
  214 |  sg->page_link |= SG_END;
      |                ^~
cc1: all warnings being treated as errors
make[4]: *** [../scripts/Makefile.build:287: drivers/nvme/host/tcp.o] Error 1
make[3]: *** [../scripts/Makefile.build:549: drivers/nvme/host] Error 2
make[2]: *** [../scripts/Makefile.build:549: drivers/nvme] Error 2
make[2]: *** Waiting for unfinished jobs....
[...]

Fixes: 3f2304f8c6d6 ("nvme-tcp: add NVMe over TCP host driver")
Reported-by: k2ci <kernel-bot@kylinos.cn>
Signed-off-by: Jackie Liu <liuyun01@kylinos.cn>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Christoph Hellwig <hch@lst.de>
drivers/nvme/host/tcp.c

index 4ceb28675fdf63b4b1dba86b0e790b925bf6b57b..8fd8cbe2368322b5f28d2762335b59314d2602ac 100644 (file)
@@ -348,7 +348,7 @@ static inline void nvme_tcp_ddgst_update(struct ahash_request *hash,
 {
        struct scatterlist sg;
 
-       sg_init_marker(&sg, 1);
+       sg_init_table(&sg, 1);
        sg_set_page(&sg, page, len, off);
        ahash_request_set_crypt(hash, &sg, NULL, len);
        crypto_ahash_update(hash);