mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fix from Herbert Xu: "This fixes a bug on sparc where we may dereference freed stack memory" * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: Work around deallocated stack frame reference gcc bug on sparc.
This commit is contained in:
commit
54ed0f71f0
4 changed files with 16 additions and 5 deletions
|
|
@ -68,6 +68,7 @@
|
|||
static inline u32 rxe_crc32(struct rxe_dev *rxe,
|
||||
u32 crc, void *next, size_t len)
|
||||
{
|
||||
u32 retval;
|
||||
int err;
|
||||
|
||||
SHASH_DESC_ON_STACK(shash, rxe->tfm);
|
||||
|
|
@ -81,7 +82,9 @@ static inline u32 rxe_crc32(struct rxe_dev *rxe,
|
|||
return crc32_le(crc, next, len);
|
||||
}
|
||||
|
||||
return *(u32 *)shash_desc_ctx(shash);
|
||||
retval = *(u32 *)shash_desc_ctx(shash);
|
||||
barrier_data(shash_desc_ctx(shash));
|
||||
return retval;
|
||||
}
|
||||
|
||||
int rxe_set_mtu(struct rxe_dev *rxe, unsigned int dev_mtu);
|
||||
|
|
|
|||
Loading…
Reference in a new issue