diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-09-17 10:38:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-09-17 10:38:01 -0700 |
| commit | 39e0c8afdce04157ce229c3d4aa21f80356e88c1 (patch) | |
| tree | 169527385e08a4967d84cbc0eb6c06b9868c7bac | |
| parent | 3fde3003cab845c124253c0a42eb0cf70220c5da (diff) | |
| parent | 59d8d24f4610333560cf2e8fe3f44cafe30322eb (diff) | |
| download | linux-39e0c8afdce04157ce229c3d4aa21f80356e88c1.tar.gz | |
Merge tag '6.6-rc1-ksmbd' of git://git.samba.org/ksmbd
Pull smb server fixes from Steve French:
"Two ksmbd server fixes"
* tag '6.6-rc1-ksmbd' of git://git.samba.org/ksmbd:
ksmbd: fix passing freed memory 'aux_payload_buf'
ksmbd: remove unneeded mark_inode_dirty in set_info_sec()
| -rw-r--r-- | fs/smb/server/smb2pdu.c | 2 | ||||
| -rw-r--r-- | fs/smb/server/smbacl.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/fs/smb/server/smb2pdu.c b/fs/smb/server/smb2pdu.c index 749660110878fd..544022dd6d2007 100644 --- a/fs/smb/server/smb2pdu.c +++ b/fs/smb/server/smb2pdu.c @@ -6312,7 +6312,7 @@ int smb2_read(struct ksmbd_work *work) aux_payload_buf, nbytes); kvfree(aux_payload_buf); - + aux_payload_buf = NULL; nbytes = 0; if (remain_bytes < 0) { err = (int)remain_bytes; diff --git a/fs/smb/server/smbacl.c b/fs/smb/server/smbacl.c index e5e438bf549965..6c0305be895e56 100644 --- a/fs/smb/server/smbacl.c +++ b/fs/smb/server/smbacl.c @@ -1420,7 +1420,6 @@ int set_info_sec(struct ksmbd_conn *conn, struct ksmbd_tree_connect *tcon, out: posix_acl_release(fattr.cf_acls); posix_acl_release(fattr.cf_dacls); - mark_inode_dirty(inode); return rc; } |