s3: Fix bug #8674.

Buffer overflow issue with AES encryption in samba traffic analyzer.
(cherry picked from commit bb38a79656b6ddee01327c328435043a7d0a112b)

diff --git a/source3/modules/vfs_smb_traffic_analyzer.c b/source3/modules/vfs_smb_traffic_analyzer.c
index 07264be0aa93913e841c8659ca25abe354aad3e3..5c91e3cf4dacc7164cc9c1de639a65c506d91263 100644 (file)
--- a/source3/modules/vfs_smb_traffic_analyzer.c
+++ b/source3/modules/vfs_smb_traffic_analyzer.c
@@ -186,8 +186,7 @@ static char *smb_traffic_analyzer_encrypt( TALLOC_CTX *ctx,
                samba_AES_encrypt((unsigned char *) str+(16*h), crypted, &key);
                for (d = 0; d<16; d++) output[d+(16*h)]=crypted[d];
        }
-       samba_AES_encrypt( (unsigned char *) str+(16*h), filler, &key );
-       for (d = 0;d < 16; d++) output[d+(16*h)]=*(filler+d);
+       samba_AES_encrypt(filler, (unsigned char *)(output+(16*h)), &key);
        *len = (s1*16)+16;
        return output;  
 }