diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-01 08:15:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-01 08:15:36 -0700 |
| commit | a0be7522b25f17ac2c3964a24b88b5fe7c9404b8 (patch) | |
| tree | aba2be9ce572e19d6dc65c56adaa3398a03578c4 /include | |
| parent | 3b2b74cad34e7a0cf6d4929ee9e8ad4e11a84867 (diff) | |
| parent | b1145ce395f7785487c128fe8faf8624e6586d84 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
[CRYPTO] cryptd: Correct kzalloc error test
[CRYPTO] eseqiv: Fix off-by-one encryption
[CRYPTO] api: Fix scatterwalk_sg_chain
[CRYPTO] authenc: Fix async crypto crash in crypto_authenc_genicv()
Diffstat (limited to 'include')
| -rw-r--r-- | include/crypto/scatterwalk.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/crypto/scatterwalk.h b/include/crypto/scatterwalk.h index 224658b8d806..833d208c25d6 100644 --- a/include/crypto/scatterwalk.h +++ b/include/crypto/scatterwalk.h @@ -57,10 +57,14 @@ static inline void scatterwalk_sg_chain(struct scatterlist *sg1, int num, struct scatterlist *sg2) { sg_set_page(&sg1[num - 1], (void *)sg2, 0, 0); + sg1[num - 1].page_link &= ~0x02; } static inline struct scatterlist *scatterwalk_sg_next(struct scatterlist *sg) { + if (sg_is_last(sg)) + return NULL; + return (++sg)->length ? sg : (void *)sg_page(sg); } |