Commit 215533f8 authored by Paulo Alcantara's avatar Paulo Alcantara Committed by Steve French
Browse files

smb: client: fix warning in CIFSFindNext() 

This fixes the following warning reported by kernel test robot

  fs/smb/client/cifssmb.c:4216 CIFSFindNext() warn: missing error
  code? 'rc'

Link: https://lore.kernel.org/all/202306170124.CtQqzf0I-lkp@intel.com/


Signed-off-by: default avatarPaulo Alcantara (SUSE) <pc@manguebit.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 032137fe

fs/smb/client/cifssmb.c

+51 −60
Original line number Diff line number Diff line
@@ -4099,11 +4099,12 @@ int CIFSFindNext(const unsigned int xid, struct cifs_tcon *tcon, 
	TRANSACTION2_FNEXT_REQ *pSMB = NULL;

	TRANSACTION2_FNEXT_RSP *pSMBr = NULL;

	T2_FNEXT_RSP_PARMS *parms;

	char *response_data;

	int rc = 0;

	int bytes_returned;

	unsigned int name_len;

	unsigned int lnoff;

	__u16 params, byte_count;

	char *response_data;

	int bytes_returned;

	int rc = 0;



	cifs_dbg(FYI, "In FindNext\n");
@@ -4148,8 +4149,8 @@ int CIFSFindNext(const unsigned int xid, struct cifs_tcon *tcon, 
		pSMB->ResumeFileName[name_len] = 0;

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

	} else {

		rc = -EINVAL;

		goto FNext2_err_exit;

		cifs_buf_release(pSMB);

		return -EINVAL;

	}

	byte_count = params + 1 /* pad */ ;

	pSMB->TotalParameterCount = cpu_to_le16(params);
@@ -4160,71 +4161,61 @@ int CIFSFindNext(const unsigned int xid, struct cifs_tcon *tcon, 
	rc = SendReceive(xid, tcon->ses, (struct smb_hdr *) pSMB,

			(struct smb_hdr *) pSMBr, &bytes_returned, 0);

	cifs_stats_inc(&tcon->stats.cifs_stats.num_fnext);



	if (rc) {

		cifs_buf_release(pSMB);

		if (rc == -EBADF) {

			psrch_inf->endOfSearch = true;

			cifs_buf_release(pSMB);

			rc = 0; /* search probably was closed at end of search*/

		} else

		} else {

			cifs_dbg(FYI, "FindNext returned = %d\n", rc);

	} else {                /* decode response */

		rc = validate_t2((struct smb_t2_rsp *)pSMBr);



		if (rc == 0) {

			unsigned int lnoff;

		}

		return rc;

	}



	/* decode response */

	rc = validate_t2((struct smb_t2_rsp *)pSMBr);

	if (rc) {

		cifs_buf_release(pSMB);

		return rc;

	}

	/* BB fixme add lock for file (srch_info) struct here */

			if (pSMBr->hdr.Flags2 & SMBFLG2_UNICODE)

				psrch_inf->unicode = true;

			else

				psrch_inf->unicode = false;

	psrch_inf->unicode = !!(pSMBr->hdr.Flags2 & SMBFLG2_UNICODE);

	response_data = (char *)&pSMBr->hdr.Protocol +

		le16_to_cpu(pSMBr->t2.ParameterOffset);

	parms = (T2_FNEXT_RSP_PARMS *)response_data;

	response_data = (char *)&pSMBr->hdr.Protocol +

		le16_to_cpu(pSMBr->t2.DataOffset);



	if (psrch_inf->smallBuf)

				cifs_small_buf_release(

					psrch_inf->ntwrk_buf_start);

		cifs_small_buf_release(psrch_inf->ntwrk_buf_start);

	else

		cifs_buf_release(psrch_inf->ntwrk_buf_start);



	psrch_inf->srch_entries_start = response_data;

	psrch_inf->ntwrk_buf_start = (char *)pSMB;

	psrch_inf->smallBuf = false;

			if (parms->EndofSearch)

				psrch_inf->endOfSearch = true;

			else

				psrch_inf->endOfSearch = false;

			psrch_inf->entries_in_buffer =

						le16_to_cpu(parms->SearchCount);

			psrch_inf->index_of_last_entry +=

				psrch_inf->entries_in_buffer;

	psrch_inf->endOfSearch = !!parms->EndofSearch;

	psrch_inf->entries_in_buffer = le16_to_cpu(parms->SearchCount);

	psrch_inf->index_of_last_entry += psrch_inf->entries_in_buffer;

	lnoff = le16_to_cpu(parms->LastNameOffset);

	if (CIFSMaxBufSize < lnoff) {

		cifs_dbg(VFS, "ignoring corrupt resume name\n");

		psrch_inf->last_entry = NULL;

				return rc;

			} else

	} else {

		psrch_inf->last_entry =

			psrch_inf->srch_entries_start + lnoff;



/*  cifs_dbg(FYI, "fnxt2 entries in buf %d index_of_last %d\n",

    psrch_inf->entries_in_buffer, psrch_inf->index_of_last_entry); */



			/* BB fixme add unlock here */

	}

	/* BB fixme add unlock here */



	}



	/* BB On error, should we leave previous search buf (and count and

	last entry fields) intact or free the previous one? */



	/* Note: On -EAGAIN error only caller can retry on handle based calls

	since file handle passed in no longer valid */

FNext2_err_exit:

	if (rc != 0)

		cifs_buf_release(pSMB);

	return rc;

	/*

	 * BB: On error, should we leave previous search buf

	 * (and count and last entry fields) intact or free the previous one?

	 *

	 * Note: On -EAGAIN error only caller can retry on handle based calls

	 * since file handle passed in no longer valid.

	 */

	return 0;

}



int