diff options
| author | Jeremy Allison <jra@samba.org> | 2014-08-26 11:40:19 -0700 |
|---|---|---|
| committer | David Disseldorp <ddiss@samba.org> | 2014-09-16 01:56:54 +0200 |
| commit | d17fc79ee6c80702fe5ce007bdbc68b3d21bc8a0 (patch) | |
| tree | 01199cb54e6241f15d3ba4ce7a59f16318e7fd7f | |
| parent | 2bddcee5cb1a08228974c8d42aee0f26876d7503 (diff) | |
| download | samba-d17fc79ee6c80702fe5ce007bdbc68b3d21bc8a0.tar.gz | |
s3: smbd: smbd_marshall_dir_entry() no longer needs explicit 'out_of_space' parameter.
Handle this in the caller when it returns STATUS_MORE_ENTRIES.
Bug 10775 - smbd crashes when accessing garbage filenames
https://bugzilla.samba.org/show_bug.cgi?id=10775
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
| -rw-r--r-- | source3/smbd/trans2.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 1a145c72b1e..b950820671b 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -1586,7 +1586,6 @@ static NTSTATUS smbd_marshall_dir_entry(TALLOC_CTX *ctx, char *base_data, char **ppdata, char *end_data, - bool *out_of_space, uint64_t *last_entry_off) { char *p, *q, *pdata = *ppdata; @@ -1604,8 +1603,6 @@ static NTSTATUS smbd_marshall_dir_entry(TALLOC_CTX *ctx, int pad = 0; NTSTATUS status; - *out_of_space = false; - ZERO_STRUCT(mdate_ts); ZERO_STRUCT(adate_ts); ZERO_STRUCT(create_date_ts); @@ -1642,7 +1639,6 @@ static NTSTATUS smbd_marshall_dir_entry(TALLOC_CTX *ctx, pad -= off; if (pad && pad > space_remaining) { - *out_of_space = true; DEBUG(9,("smbd_marshall_dir_entry: out of space " "for padding (wanted %u, had %d)\n", (unsigned int)pad, @@ -1782,7 +1778,6 @@ static NTSTATUS smbd_marshall_dir_entry(TALLOC_CTX *ctx, /* We need to determine if this entry will fit in the space available. */ /* Max string size is 255 bytes. */ if (PTR_DIFF(p + 255 + ea_len,pdata) > space_remaining) { - *out_of_space = true; DEBUG(9,("smbd_marshall_dir_entry: out of space " "(wanted %u, had %d)\n", (unsigned int)PTR_DIFF(p + 255 + ea_len,pdata), @@ -2202,7 +2197,6 @@ static NTSTATUS smbd_marshall_dir_entry(TALLOC_CTX *ctx, } if (PTR_DIFF(p,pdata) > space_remaining) { - *out_of_space = true; DEBUG(9,("smbd_marshall_dir_entry: out of space " "(wanted %u, had %d)\n", (unsigned int)PTR_DIFF(p,pdata), @@ -2306,11 +2300,11 @@ bool smbd_dirptr_lanman2_entry(TALLOC_CTX *ctx, base_data, ppdata, end_data, - out_of_space, &last_entry_off); TALLOC_FREE(fname); TALLOC_FREE(smb_fname); if (NT_STATUS_EQUAL(status, STATUS_MORE_ENTRIES)) { + *out_of_space = true; dptr_SeekDir(dirptr, prev_dirpos); return false; } |