Commit 39e0c8af authored by Linus Torvalds's avatar Linus Torvalds

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()
parents 3fde3003 59d8d24f
...@@ -6312,7 +6312,7 @@ int smb2_read(struct ksmbd_work *work) ...@@ -6312,7 +6312,7 @@ int smb2_read(struct ksmbd_work *work)
aux_payload_buf, aux_payload_buf,
nbytes); nbytes);
kvfree(aux_payload_buf); kvfree(aux_payload_buf);
aux_payload_buf = NULL;
nbytes = 0; nbytes = 0;
if (remain_bytes < 0) { if (remain_bytes < 0) {
err = (int)remain_bytes; err = (int)remain_bytes;
......
...@@ -1420,7 +1420,6 @@ int set_info_sec(struct ksmbd_conn *conn, struct ksmbd_tree_connect *tcon, ...@@ -1420,7 +1420,6 @@ int set_info_sec(struct ksmbd_conn *conn, struct ksmbd_tree_connect *tcon,
out: out:
posix_acl_release(fattr.cf_acls); posix_acl_release(fattr.cf_acls);
posix_acl_release(fattr.cf_dacls); posix_acl_release(fattr.cf_dacls);
mark_inode_dirty(inode);
return rc; return rc;
} }
......
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