Commit 94a1f56d authored by Linus Torvalds's avatar Linus Torvalds

Merge tag '6.2-rc8-smb3-client-fix' of git://git.samba.org/sfrench/cifs-2.6

Pull cifx fix from Steve French:
 "Small fix for use after free"

* tag '6.2-rc8-smb3-client-fix' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: Fix use-after-free in rdata->read_into_pages()
parents 0983f6bf aa5465ae
...@@ -3889,7 +3889,7 @@ uncached_fill_pages(struct TCP_Server_Info *server, ...@@ -3889,7 +3889,7 @@ uncached_fill_pages(struct TCP_Server_Info *server,
rdata->got_bytes += result; rdata->got_bytes += result;
} }
return rdata->got_bytes > 0 && result != -ECONNABORTED ? return result != -ECONNABORTED && rdata->got_bytes > 0 ?
rdata->got_bytes : result; rdata->got_bytes : result;
} }
...@@ -4665,7 +4665,7 @@ readpages_fill_pages(struct TCP_Server_Info *server, ...@@ -4665,7 +4665,7 @@ readpages_fill_pages(struct TCP_Server_Info *server,
rdata->got_bytes += result; rdata->got_bytes += result;
} }
return rdata->got_bytes > 0 && result != -ECONNABORTED ? return result != -ECONNABORTED && rdata->got_bytes > 0 ?
rdata->got_bytes : result; rdata->got_bytes : result;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment