Check return value of copy_to_user in fs/cifs/file.c
PATCH 1/1 Check return value of copy_to_user in fs/cifs/file.c
Hello,
the following patch against 2.6.11-rc3 fixes this compile time warning:
CC [M] fs/cifs/file.ofs/cifs/file.c: In function `cifs_user_read':fs/cifs/file.c:1168: warning: ignoring return value of `copy_to_user', declared with attribute warn_unused_result
I also added an explicit check for errors other than -EAGAIN, since CIFSSMBRead may return -ENOMEM if it's unable to allocate smb_com_read_rsp; in that case we don't want to call copy_to_user with a NULL pointer.
Signed-off-by Luca Tettamanti <[email protected]>
fs/cifs/file.c +11 -2
@@ -1151,7 +1151,7 @@ current_read_size = min_t(const int,read_size - total_read,cifs_sb->rsize); rc = -EAGAIN ; smb_read_data =NULL ; -while (rc == -EAGAIN ) { +while (1 ) {if ((open_file->invalidHandle) && (!open_file->closePend)) { rc =cifs_reopen_file (file->f_dentry->d_inode, file,TRUE);
@@ -1164,13 +1164,22 @@ current_read_size, *poffset, &bytes_read, &smb_read_data); +if (rc == -EAGAIN ) +continue ; +else +break ; + pSMBr = (struct smb_com_read_rsp *)smb_read_data; -copy_to_user (current_offset,smb_read_data +4 /* RFC1001 hdr*/ + rc =copy_to_user (current_offset,smb_read_data +4 /* RFC1001 hdr*/ +le16_to_cpu (pSMBr->DataOffset), bytes_read);if (smb_read_data) {cifs_buf_release (smb_read_data); smb_read_data =NULL ; } +if (rc) { +FreeXid (xid); +return -EFAULT ; + } }if (rc || (bytes_read ==0 )) {if (total_read) {
Luca
Signature · 3 lines
Home: http://kronoz.cjb.net Quando un uomo porta dei fiori a sua moglie senza motivo, un motivo c'e`.