Merge branch 'md-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md into block-5.13

axboe · axboe · commit 85f3f17b5db2 · 2021-06-11T11:56:08.000-06:00
Pull MD related fix from Song. * 'md-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md: async_xor: check src_offs is not NULL before updating it
diff --git a/crypto/async_tx/async_xor.c b/crypto/async_tx/async_xor.c
@@ -233,7 +233,8 @@ async_xor_offs(struct page *dest, unsigned int offset,
 		if (submit->flags & ASYNC_TX_XOR_DROP_DST) {
 			src_cnt--;
 			src_list++;
-			src_offs++;
+			if (src_offs)
+				src_offs++;
 		}
 
 		/* wait for any prerequisite operations */

Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,8 @@ async_xor_offs(struct page *dest, unsigned int offset,`
`233`	`233`	`if (submit->flags & ASYNC_TX_XOR_DROP_DST) {`
`234`	`234`	`src_cnt--;`
`235`	`235`	`src_list++;`
`236`		`- src_offs++;`
	`236`	`+ if (src_offs)`
	`237`	`+ src_offs++;`
`237`	`238`	`}`
`238`	`239`
`239`	`240`	`/* wait for any prerequisite operations */`