diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-12-03 09:08:26 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-12-03 09:08:26 +0900 |
| commit | 968f35f4ab1c0966ceb39af3c89f2e24afedf878 (patch) | |
| tree | f89db4db01179c94baed38ac3e054febc5fb6584 /fs/smb/client/smb2pdu.c | |
| parent | 55abae438c3cf39f66c3e0cb922c3d915363afb5 (diff) | |
| parent | 0015eb6e12384ff1c589928e84deac2ad1ceb236 (diff) | |
| download | linux-stable-968f35f4ab1c0966ceb39af3c89f2e24afedf878.tar.gz linux-stable-968f35f4ab1c0966ceb39af3c89f2e24afedf878.tar.bz2 linux-stable-968f35f4ab1c0966ceb39af3c89f2e24afedf878.zip | |
Merge tag 'v6.7-rc3-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6
Pull smb client fixes from Steve French:
- Two fallocate fixes
- Fix warnings from new gcc
- Two symlink fixes
* tag 'v6.7-rc3-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6:
smb: client, common: fix fortify warnings
cifs: Fix FALLOC_FL_INSERT_RANGE by setting i_size after EOF moved
cifs: Fix FALLOC_FL_ZERO_RANGE by setting i_size if EOF moved
smb: client: report correct st_size for SMB and NFS symlinks
smb: client: fix missing mode bits for SMB symlinks
Diffstat (limited to 'fs/smb/client/smb2pdu.c')
| -rw-r--r-- | fs/smb/client/smb2pdu.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/smb/client/smb2pdu.c b/fs/smb/client/smb2pdu.c index 2eb29fa278c3..395e1230ddbc 100644 --- a/fs/smb/client/smb2pdu.c +++ b/fs/smb/client/smb2pdu.c @@ -3472,12 +3472,10 @@ __SMB2_close(const unsigned int xid, struct cifs_tcon *tcon, } else { trace_smb3_close_done(xid, persistent_fid, tcon->tid, ses->Suid); - /* - * Note that have to subtract 4 since struct network_open_info - * has a final 4 byte pad that close response does not have - */ if (pbuf) - memcpy(pbuf, (char *)&rsp->CreationTime, sizeof(*pbuf) - 4); + memcpy(&pbuf->network_open_info, + &rsp->network_open_info, + sizeof(pbuf->network_open_info)); } atomic_dec(&tcon->num_remote_opens); |