iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

crypto: Work around deallocated stack frame reference gcc bug on sparc.

Browse Source 
On sparc, if we have an alloca() like situation, as is the case with
SHASH_DESC_ON_STACK(), we can end up referencing deallocated stack
memory.  The result can be that the value is clobbered if a trap
or interrupt arrives at just the right instruction.

It only occurs if the function ends returning a value from that
alloca() area and that value can be placed into the return value
register using a single instruction.

For example, in lib/libcrc32c.c:crc32c() we end up with a return
sequence like:

        return  %i7+8
         lduw   [%o5+16], %o0   ! MEM[(u32 *)__shash_desc.1_10 + 16B],

%o5 holds the base of the on-stack area allocated for the shash
descriptor.  But the return released the stack frame and the
register window.

So if an intererupt arrives between 'return' and 'lduw', then
the value read at %o5+16 can be corrupted.

Add a data compiler barrier to work around this problem.  This is
exactly what the gcc fix will end up doing as well, and it absolutely
should not change the code generated for other cpus (unless gcc
on them has the same bug :-)

With crucial insight from Eric Sandeen.

Cc: <stable@vger.kernel.org>
Reported-by: Anatoly Pugachev <matorola@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
David Miller 2017-06-02 11:28:54 -04:00 committed by Herbert Xu
parent f3ad587070
commit d41519a69b
4 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/infiniband/sw/rxe/rxe.h
View File

@ -68,6 +68,7 @@
static inline u32 rxe_crc32(struct rxe_dev *rxe, static inline u32 rxe_crc32(struct rxe_dev *rxe,
u32 crc, void *next, size_t len) u32 crc, void *next, size_t len)
{ {
u32 retval;
int err; int err;
SHASH_DESC_ON_STACK(shash, rxe->tfm); 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 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); int rxe_set_mtu(struct rxe_dev *rxe, unsigned int dev_mtu);

5
fs/btrfs/hash.c
View File

@ -38,6 +38,7 @@ u32 btrfs_crc32c(u32 crc, const void *address, unsigned int length)
{ {
SHASH_DESC_ON_STACK(shash, tfm); SHASH_DESC_ON_STACK(shash, tfm);
u32 *ctx = (u32 *)shash_desc_ctx(shash); u32 *ctx = (u32 *)shash_desc_ctx(shash);
u32 retval;
int err; int err;
shash->tfm = tfm; shash->tfm = tfm;
@ -47,5 +48,7 @@ u32 btrfs_crc32c(u32 crc, const void *address, unsigned int length)
err = crypto_shash_update(shash, address, length); err = crypto_shash_update(shash, address, length);
BUG_ON(err); BUG_ON(err);
return *ctx; retval = *ctx;
barrier_data(ctx);
return retval;
} }

5
fs/f2fs/f2fs.h
View File

@ -1078,6 +1078,7 @@ static inline u32 f2fs_crc32(struct f2fs_sb_info *sbi, const void *address,
{ {
SHASH_DESC_ON_STACK(shash, sbi->s_chksum_driver); SHASH_DESC_ON_STACK(shash, sbi->s_chksum_driver);
u32 *ctx = (u32 *)shash_desc_ctx(shash); u32 *ctx = (u32 *)shash_desc_ctx(shash);
u32 retval;
int err; int err;
shash->tfm = sbi->s_chksum_driver; shash->tfm = sbi->s_chksum_driver;
@ -1087,7 +1088,9 @@ static inline u32 f2fs_crc32(struct f2fs_sb_info *sbi, const void *address,
err = crypto_shash_update(shash, address, length); err = crypto_shash_update(shash, address, length);
BUG_ON(err); BUG_ON(err);
return *ctx; retval = *ctx;
barrier_data(ctx);
return retval;
} }
static inline bool f2fs_crc_valid(struct f2fs_sb_info *sbi, __u32 blk_crc, static inline bool f2fs_crc_valid(struct f2fs_sb_info *sbi, __u32 blk_crc,

6
lib/libcrc32c.c
View File

@ -43,7 +43,7 @@ static struct crypto_shash *tfm;
u32 crc32c(u32 crc, const void *address, unsigned int length) u32 crc32c(u32 crc, const void *address, unsigned int length)
{ {
SHASH_DESC_ON_STACK(shash, tfm); SHASH_DESC_ON_STACK(shash, tfm);
u32 *ctx = (u32 *)shash_desc_ctx(shash); u32 ret, *ctx = (u32 *)shash_desc_ctx(shash);
int err; int err;
shash->tfm = tfm; shash->tfm = tfm;
@ -53,7 +53,9 @@ u32 crc32c(u32 crc, const void *address, unsigned int length)
err = crypto_shash_update(shash, address, length); err = crypto_shash_update(shash, address, length);
BUG_ON(err); BUG_ON(err);
return *ctx; ret = *ctx;
barrier_data(ctx);
return ret;
} }
EXPORT_SYMBOL(crc32c); EXPORT_SYMBOL(crc32c);