cifs: fix double-fault crash during ntlmssp
Subsystems (2)
PATCH 1/1 cifs: fix double-fault crash during ntlmssp
The crash occurred because we were calling memzero_explicit() on an already freed sess_data::iov[1] (ntlmsspblob) in sess_free_buffer().
Fix this by not calling memzero_explicit() on sess_data::iov[1] as it's already by handled by callers.
Fixes d867d4ae29c7 ("cifs: replace kfree() with kfree_sensitive() for sensitive data")
Signed-off-by Paulo Alcantara (SUSE) <[email protected]>
--- fs/cifs/sess.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
fs/cifs/sess.c +9 -7
@@ -1213,16 +1213,18 @@ sess_alloc_buffer(struct sess_data *sess_data, int wct)static void sess_free_buffer (struct sess_data *sess_data) { -int i; +struct kvec *iov = sess_data->iov; -/* zero the session data before freeing, as it might contain sensitive info (keys, etc) */ -for (i =0 ; i <3 ; i++) -if (sess_data->iov[i].iov_base) -memzero_explicit (sess_data->iov[i].iov_base, sess_data->iov[i].iov_len); +/* +* Zero the session data before freeing, as it might contain sensitive info (keys, etc). +* Note that iov[1] is already freed by caller. +*/ +if (sess_data->buf0_type !=CIFS_NO_BUFFER && iov[0 ].iov_base) +memzero_explicit (iov[0 ].iov_base, iov[0 ].iov_len); -free_rsp_buf (sess_data->buf0_type, sess_data->iov[0 ].iov_base); +free_rsp_buf (sess_data->buf0_type, iov[0 ].iov_base); sess_data->buf0_type =CIFS_NO_BUFFER ; -kfree (sess_data->iov[2 ].iov_base); +kfree_sensitive (iov[2 ].iov_base); } static int
Signature · 1 line
2.37.3
Quoted 8 lines · Paulo Alcantara
The crash occurred because we were calling
memzero_explicit()on an already freed sess_data::iov[1] (ntlmsspblob) insess_free_buffer().Fix this by not calling
memzero_explicit()on sess_data::iov[1] as it's already by handled by callers.Fixes d867d4ae29c7 ("cifs: replace kfree() with kfree_sensitive() for sensitive data")Signed-off-by Paulo Alcantara (SUSE) <[email protected]>
Good catch! Thanks.
Reviewed-by Enzo Matsumiya <[email protected]>
Quoted 37 lines
---
fs/cifs/sess.c| 16 +++++++++-------1 file changed, 9 insertions(+), 7 deletions(-)fs/cifs/sess.c +0
-0@@ -1213,16 +1213,18 @@ sess_alloc_buffer(struct sess_data *sess_data, int wct)static void
sess_free_buffer(struct sess_data *sess_data)
{fs/cifs/sess.c +8
-6-int i; +struct kvec *iov = sess_data->iov; -/* zero the session data before freeing, as it might contain sensitive info (keys, etc) */ -for (i =0 ; i <3 ; i++) -if (sess_data->iov[i].iov_base) -memzero_explicit (sess_data->iov[i].iov_base, sess_data->iov[i].iov_len); +/* +* Zero the session data before freeing, as it might contain sensitive info (keys, etc). +* Note that iov[1] is already freed by caller. +*/ +if (sess_data->buf0_type !=CIFS_NO_BUFFER && iov[0 ].iov_base) +memzero_explicit (iov[0 ].iov_base, iov[0 ].iov_len); -free_rsp_buf (sess_data->buf0_type, sess_data->iov[0 ].iov_base); +free_rsp_buf (sess_data->buf0_type, iov[0 ].iov_base);sess_data->buf0_type = CIFS_NO_BUFFER;fs/cifs/sess.c +1
-1-kfree (sess_data->iov[2 ].iov_base); +kfree_sensitive (iov[2 ].iov_base);}
static int
Signature · 1 line
2.37.3