Merge branch 'akpm' (patches from Andrew)

[platform/kernel/linux-rpi.git] / fs / cifs / misc.c

diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
index 7642348..1c14cf0 100644 (file)
--- a/fs/cifs/misc.c
+++ b/fs/cifs/misc.c
@@ -103,12 +103,12 @@ sesInfoFree(struct cifs_ses *buf_to_free)
        kfree(buf_to_free->serverOS);
        kfree(buf_to_free->serverDomain);
        kfree(buf_to_free->serverNOS);
        kfree(buf_to_free->serverOS);
        kfree(buf_to_free->serverDomain);
        kfree(buf_to_free->serverNOS);

-       kzfree(buf_to_free->password);
+       kfree_sensitive(buf_to_free->password);

        kfree(buf_to_free->user_name);
        kfree(buf_to_free->domainName);
        kfree(buf_to_free->user_name);
        kfree(buf_to_free->domainName);

-       kzfree(buf_to_free->auth_key.response);
+       kfree_sensitive(buf_to_free->auth_key.response);

        kfree(buf_to_free->iface_list);
        kfree(buf_to_free->iface_list);

-       kzfree(buf_to_free);
+       kfree_sensitive(buf_to_free);

 }
 
 struct cifs_tcon *
 }
 
 struct cifs_tcon *


@@ -148,7 +148,7 @@ tconInfoFree(struct cifs_tcon *buf_to_free)
        }
        atomic_dec(&tconInfoAllocCount);
        kfree(buf_to_free->nativeFileSystem);
        }
        atomic_dec(&tconInfoAllocCount);
        kfree(buf_to_free->nativeFileSystem);

-       kzfree(buf_to_free->password);
+       kfree_sensitive(buf_to_free->password);

        kfree(buf_to_free->crfid.fid);
 #ifdef CONFIG_CIFS_DFS_UPCALL
        kfree(buf_to_free->dfs_path);
        kfree(buf_to_free->crfid.fid);
 #ifdef CONFIG_CIFS_DFS_UPCALL
        kfree(buf_to_free->dfs_path);