summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2021-06-11 11:56:08 -0600
committerJens Axboe <axboe@kernel.dk>2021-06-11 11:56:08 -0600
commit85f3f17b5db2dd9f8a094a0ddc665555135afd22 (patch)
tree24b5587d83de1a9cd8fc9abb229d13adfc99abad
parent990e78116d38059c9306cf0560c1c4ed1cf358d3 (diff)
parent9be148e408df7d361ec5afd6299b7736ff3928b0 (diff)
downloadlinux-85f3f17b5db2dd9f8a094a0ddc665555135afd22.tar.bz2
Merge branch 'md-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md into block-5.13
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
-rw-r--r--crypto/async_tx/async_xor.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/async_tx/async_xor.c b/crypto/async_tx/async_xor.c
index 6cd7f7025df4..d8a91521144e 100644
--- 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 */