diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-04 10:22:08 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-04 10:22:08 -0800 |
| commit | 5ee0e962603ef7d41d8e6581963c8557501dfcad (patch) | |
| tree | 755bc530759542aa01c7ab8475fd86935fbbf659 /fs/cifs/smbencrypt.c | |
| parent | 5659c0e4708d2893606df3335cb453f17220bd60 (diff) | |
| parent | 7a1ceba071709d11271ebd921310b5a18404dd33 (diff) | |
| download | linux-5ee0e962603ef7d41d8e6581963c8557501dfcad.tar.gz linux-5ee0e962603ef7d41d8e6581963c8557501dfcad.tar.bz2 linux-5ee0e962603ef7d41d8e6581963c8557501dfcad.zip | |
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
Pull cifs fixes from Steve French:
"Three small cifs fixes. One fixes a hang under stress, and the other
two are security related"
* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
cifs: fix MUST SecurityFlags filtering
Complete oplock break jobs before closing file handle
cifs: use memzero_explicit to clear stack buffer
Diffstat (limited to 'fs/cifs/smbencrypt.c')
| -rw-r--r-- | fs/cifs/smbencrypt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/smbencrypt.c b/fs/cifs/smbencrypt.c index 6c1566366a66..a4232ec4f2ba 100644 --- a/fs/cifs/smbencrypt.c +++ b/fs/cifs/smbencrypt.c @@ -221,7 +221,7 @@ E_md4hash(const unsigned char *passwd, unsigned char *p16, } rc = mdfour(p16, (unsigned char *) wpwd, len * sizeof(__le16)); - memset(wpwd, 0, 129 * sizeof(__le16)); + memzero_explicit(wpwd, sizeof(wpwd)); return rc; } |