From 1b77c97c74bebb030143cf8485aad0f442dfeebd Mon Sep 17 00:00:00 2001 From: Namjae Jeon Date: Sat, 26 Sep 2026 22:48:12 +0900 Subject: [PATCH] ksmbd: enforce POSIX append-only writes POSIX append-only opens do not set O_APPEND, and the SMB append sentinel is rejected as a negative write offset. Track append-only POSIX opens, set O_APPEND and require the U64_MAX offset sentinel for their writes. Accept FILE_WRITE_DATA or FILE_APPEND_DATA for WRITE requests, preserving ordinary SMB write permissions. Use the POSIX append flag and offset check to prevent POSIX append-only opens from overwriting existing data. For synchronous writes, derive the fsync range from the completed write position so append writes flush the range actually written. Signed-off-by: Namjae Jeon --- fs/smb/server/smb2pdu.c | 14 ++++++++++++-- fs/smb/server/vfs.c | 3 +-- fs/smb/server/vfs_cache.h | 1 + 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/fs/smb/server/smb2pdu.c b/fs/smb/server/smb2pdu.c index 2d250875b0ad..b3d24829817d 100644 --- a/fs/smb/server/smb2pdu.c +++ b/fs/smb/server/smb2pdu.c @@ -4735,6 +4735,9 @@ resolve_path: &may_flags, req->CreateOptions, file_present ? d_inode(path.dentry)->i_mode : 0); + if (posix_ctxt && (req->DesiredAccess & FILE_APPEND_DATA_LE) && + !(req->DesiredAccess & FILE_WRITE_DATA_LE)) + open_flags |= O_APPEND; if (!test_tree_conn_flag(tcon, KSMBD_TREE_CONN_FLAG_WRITABLE)) { if (open_flags & (O_CREAT | O_TRUNC)) { @@ -4974,6 +4977,7 @@ resolve_path: FILE_WRITE_ATTRIBUTES_LE | FILE_SYNCHRONIZE_LE)); fp->is_posix_ctxt = posix_ctxt; + fp->posix_append = posix_ctxt && !!(open_flags & O_APPEND); /* fp should be searchable through ksmbd_inode.m_fp_list * after daccess, saccess, attrib_only, and stream are @@ -9800,6 +9804,7 @@ int smb2_write(struct ksmbd_work *work) ssize_t nbytes; char *data_buf; bool writethrough = false, is_rdma_channel = false; + bool append_write; bool async_interim = false; bool chseq_err = false; int err = 0; @@ -9831,7 +9836,8 @@ int smb2_write(struct ksmbd_work *work) return smb2_write_pipe(work); } - offset = le64_to_cpu(req->Offset); + append_write = le64_to_cpu(req->Offset) == U64_MAX; + offset = append_write ? 0 : le64_to_cpu(req->Offset); if (offset < 0) { err = -EINVAL; goto out; @@ -9934,11 +9940,15 @@ int smb2_write(struct ksmbd_work *work) goto out; } - if (!(fp->daccess & (FILE_WRITE_DATA_LE | FILE_READ_ATTRIBUTES_LE))) { + if (!(fp->daccess & (FILE_WRITE_DATA_LE | FILE_APPEND_DATA_LE))) { pr_err("Not permitted to write : 0x%x\n", fp->daccess); err = -EACCES; goto out; } + if (append_write != fp->posix_append) { + err = -EINVAL; + goto out; + } if (work->next_smb2_rcv_hdr_off && !req->hdr.NextCommand) { err = setup_async_work(work, NULL, NULL); diff --git a/fs/smb/server/vfs.c b/fs/smb/server/vfs.c index d21ed90454f9..d4d669f12283 100644 --- a/fs/smb/server/vfs.c +++ b/fs/smb/server/vfs.c @@ -526,7 +526,6 @@ int ksmbd_vfs_write(struct ksmbd_work *work, struct ksmbd_file *fp, ssize_t *written) { struct file *filp; - loff_t offset = *pos; int err = 0; if (work->conn->connection_type) { @@ -573,7 +572,7 @@ int ksmbd_vfs_write(struct ksmbd_work *work, struct ksmbd_file *fp, *written = err; err = 0; if (sync) { - err = vfs_fsync_range(filp, offset, offset + *written, 0); + err = vfs_fsync_range(filp, *pos - *written, *pos, 0); if (err < 0) pr_err("fsync failed for filename = %pD, err = %d\n", fp->filp, err); diff --git a/fs/smb/server/vfs_cache.h b/fs/smb/server/vfs_cache.h index 9de41b6e28ba..c00d92fdf94a 100644 --- a/fs/smb/server/vfs_cache.h +++ b/fs/smb/server/vfs_cache.h @@ -171,6 +171,7 @@ struct ksmbd_file { bool durable_replay_consumed; bool is_posix_ctxt; + bool posix_append; struct durable_owner owner; __le16 channel_sequence; unsigned int outstanding_requests; -- knotmirror 0.0.1