Commit ef6724e3 authored by Steve French's avatar Steve French
Browse files

[CIFS] Fix missing entries in search results when very long file names and 


more than 50 (or so) of such long search entries in the directory.  FindNext
could send corrupt last byte of resume name when resume key was a few hundred
bytes long file name or longer.

Fixes Samba Bug # 2932

Signed-off-by: default avatarSteve French <(sfrench@us.ibm.com)>
parent bcf7e34a

fs/cifs/cifssmb.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -2628,6 +2628,9 @@ int CIFSFindNext(const int xid, struct cifsTconInfo *tcon, 
	if(name_len < PATH_MAX) {

	if(name_len < PATH_MAX) {

		memcpy(pSMB->ResumeFileName, psrch_inf->presume_name, name_len);

		memcpy(pSMB->ResumeFileName, psrch_inf->presume_name, name_len);

		byte_count += name_len;

		byte_count += name_len;

		/* 14 byte parm len above enough for 2 byte null terminator */

		pSMB->ResumeFileName[name_len] = 0;

		pSMB->ResumeFileName[name_len+1] = 0;

	} else {

	} else {

		rc = -EINVAL;

		rc = -EINVAL;

		goto FNext2_err_exit;

		goto FNext2_err_exit;