Skip to content

Commit 39e0c8a

Browse files
committed
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()
2 parents 3fde300 + 59d8d24 commit 39e0c8a

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

fs/smb/server/smb2pdu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6312,7 +6312,7 @@ int smb2_read(struct ksmbd_work *work)
63126312
aux_payload_buf,
63136313
nbytes);
63146314
kvfree(aux_payload_buf);
6315-
6315+
aux_payload_buf = NULL;
63166316
nbytes = 0;
63176317
if (remain_bytes < 0) {
63186318
err = (int)remain_bytes;

fs/smb/server/smbacl.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1420,7 +1420,6 @@ int set_info_sec(struct ksmbd_conn *conn, struct ksmbd_tree_connect *tcon,
14201420
out:
14211421
posix_acl_release(fattr.cf_acls);
14221422
posix_acl_release(fattr.cf_dacls);
1423-
mark_inode_dirty(inode);
14241423
return rc;
14251424
}
14261425

0 commit comments

Comments
 (0)