diff options
| author | Jeremy Allison <jra@samba.org> | 2014-06-07 21:51:44 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-06-25 03:47:54 +0200 |
| commit | 457d79f2cb83f3f5c3f8d64ed99f9b1ea0185d3f (patch) | |
| tree | 5d969bd091cda4ec9ba4037de2801445fc3f502a /source3/libsmb/clirap.c | |
| parent | d77a74237e660dd2ce9f1e14b02635f8a2569653 (diff) | |
| download | samba-457d79f2cb83f3f5c3f8d64ed99f9b1ea0185d3f.tar.gz | |
s3: smbd - fix processing of packets with invalid DOS charset conversions.
CVE-2014-3493
Bug 10654 - Segmentation fault in smbd_marshall_dir_entry()'s SMB_FIND_FILE_UNIX handler
https://bugzilla.samba.org/show_bug.cgi?id=10654
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Wed Jun 25 03:47:55 CEST 2014 on sn-devel-104
Diffstat (limited to 'source3/libsmb/clirap.c')
| -rw-r--r-- | source3/libsmb/clirap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/libsmb/clirap.c b/source3/libsmb/clirap.c index 036919f903c..64e3767c129 100644 --- a/source3/libsmb/clirap.c +++ b/source3/libsmb/clirap.c @@ -327,7 +327,7 @@ bool cli_NetServerEnum(struct cli_state *cli, char *workgroup, uint32 stype, sizeof(param) - PTR_DIFF(p,param) - 1, STR_TERMINATE|STR_UPPER); - if (len == (size_t)-1) { + if (len == 0) { SAFE_FREE(last_entry); return false; } @@ -339,7 +339,7 @@ bool cli_NetServerEnum(struct cli_state *cli, char *workgroup, uint32 stype, sizeof(param) - PTR_DIFF(p,param) - 1, STR_TERMINATE); - if (len == (size_t)-1) { + if (len == 0) { SAFE_FREE(last_entry); return false; } |