diff options
| author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-10-21 08:37:20 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-10-21 08:37:20 -0200 |
| commit | fc50fd7584832f2b4d03eca83ba1ecde4c473a3e (patch) | |
| tree | 6589908c4c15c92420a97a60aab1026a0cd88deb /crypto/lz4.c | |
| parent | f5f52c34ba387c65f0838d2bd33f24387cf2ff3f (diff) | |
| parent | 6de0bdb30d75edcf5f1e3f80da5b65670b9831f1 (diff) | |
| download | linux-crypto-fc50fd7584832f2b4d03eca83ba1ecde4c473a3e.tar.gz linux-crypto-fc50fd7584832f2b4d03eca83ba1ecde4c473a3e.zip | |
Merge tag 'v3.18-rc1' into v4l_for_linus
Linux 3.18-rc1
* tag 'v3.18-rc1': (9167 commits)
Linux 3.18-rc1
MAINTAINERS: corrected bcm2835 search
Net: DSA: Fix checking for get_phy_flags function
sparc64: Do not define thread fpregs save area as zero-length array.
sparc64: Fix corrupted thread fault code.
MAINTAINERS: Become the docs maintainer
x86,kvm,vmx: Preserve CR4 across VM entry
ipv6: fix a potential use after free in sit.c
ipv6: fix a potential use after free in ip6_offload.c
ipv4: fix a potential use after free in gre_offload.c
tcp: fix build error if IPv6 is not enabled
futex: Ensure get_futex_key_refs() always implies a barrier
bna: fix skb->truesize underestimation
net: dsa: add includes for ethtool and phy_fixed definitions
openvswitch: Set flow-key members.
netrom: use linux/uaccess.h
dsa: Fix conversion from host device to mii bus
tipc: fix bug in bundled buffer reception
ipv6: introduce tcp_v6_iif()
sfc: add support for skb->xmit_more
...
Diffstat (limited to 'crypto/lz4.c')
| -rw-r--r-- | crypto/lz4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/lz4.c b/crypto/lz4.c index 4586dd15..34d072b7 100644 --- a/crypto/lz4.c +++ b/crypto/lz4.c @@ -68,7 +68,7 @@ static int lz4_decompress_crypto(struct crypto_tfm *tfm, const u8 *src, size_t tmp_len = *dlen; size_t __slen = slen; - err = lz4_decompress(src, &__slen, dst, tmp_len); + err = lz4_decompress_unknownoutputsize(src, __slen, dst, &tmp_len); if (err < 0) return -EINVAL; |