cifs: Don't match port on SMBDirect transport
Subsystems (2)
PATCH 1/2 cifs: Don't match port on SMBDirect transport
From: Long Li <[email protected]>
SMBDirect manages its own ports in the transport layer, there is no need to check the port to find a connection.
--- fs/cifs/connect.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/cifs/connect.c +4 -0
@@ -2446,6 +2446,10 @@ match_port(struct TCP_Server_Info *server, struct sockaddr *addr) {__be16 port, *sport; +/* SMBDirect manages its own ports, don't match it here */ +if (server->rdma) +return true; +switch (addr->sa_family) {case AF_INET : sport = &((struct sockaddr_in *) &server->dstaddr)->sin_port;
Signature · 1 line
2.17.1
PATCH 2/2 cifs: Allocate memory for all iovs in smb2_ioctl
From: Long Li <[email protected]>
An IOCTL uses up to 2 iovs. The 1st iov is the command itself, the 2nd iov is optional data for that command. The 1st iov is always allocated on the heap but the 2nd iov may point to a variable on the stack. This will trigger an error when passing the 2nd iov for RDMA I/O.
Fix this by allocating a buffer for the 2nd iov.
--- fs/cifs/smb2pdu.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-)
fs/cifs/smb2pdu.c +19 -2
@@ -2538,11 +2538,25 @@ SMB2_ioctl_init(struct cifs_tcon *tcon, struct smb_rqst *rqst,struct kvec *iov = rqst->rq_iov;unsigned int total_len;int rc; +char *in_data_buf; rc =smb2_plain_req_init (SMB2_IOCTL , tcon, (void **) &req, &total_len);if (rc)return rc; +if (indatalen) { +/* +* indatalen is usually small at a couple of bytes max, so +* just allocate through generic pool +*/ + in_data_buf =kmalloc (indatalen,GFP_NOFS ); +if (!in_data_buf) { +cifs_small_buf_release (req); +return -ENOMEM ; + } +memcpy (in_data_buf, in_data, indatalen); + } + req->CtlCode =cpu_to_le32 (opcode); req->PersistentFileId = persistent_fid; req->VolatileFileId = volatile_fid;
@@ -2563,7 +2577,7 @@ SMB2_ioctl_init(struct cifs_tcon *tcon, struct smb_rqst *rqst,cpu_to_le32 (offsetof(struct smb2_ioctl_req , Buffer)); rqst->rq_nvec =2 ; iov[0 ].iov_len = total_len -1 ; - iov[1 ].iov_base = in_data; + iov[1 ].iov_base = in_data_buf; iov[1 ].iov_len = indatalen; }else { rqst->rq_nvec =1 ;
@@ -2605,8 +2619,11 @@ SMB2_ioctl_init(struct cifs_tcon *tcon, struct smb_rqst *rqst,void SMB2_ioctl_free (struct smb_rqst *rqst) { -if (rqst && rqst->rq_iov) +if (rqst && rqst->rq_iov) {cifs_small_buf_release (rqst->rq_iov[0 ].iov_base);/* request */ +if (rqst->rq_iov[1 ].iov_len) +kfree (rqst->rq_iov[1 ].iov_base); + } }
Signature · 1 line
2.17.1
Re: [PATCH 2/2] cifs: Allocate memory for all iovs in smb2_ioctl
ср, 15 мая 2019 г. в 14:10, <[email protected]>:
Quoted 68 lines
From: Long Li <[email protected]>
An IOCTL uses up to 2 iovs. The 1st iov is the command itself, the 2nd iov is optional data for that command. The 1st iov is always allocated on the heap but the 2nd iov may point to a variable on the stack. This will trigger an error when passing the 2nd iov for RDMA I/O.
Fix this by allocating a buffer for the 2nd iov.
Signed-off-by Long Li <[email protected]>--- fs/cifs/smb2pdu.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-)fs/cifs/smb2pdu.c +19
-3@@ -2538,11 +2538,25 @@ SMB2_ioctl_init(struct cifs_tcon *tcon, struct smb_rqst *rqst,struct kvec *iov = rqst->rq_iov;unsigned int total_len;int rc; +char *in_data_buf; rc =smb2_plain_req_init (SMB2_IOCTL , tcon, (void **) &req, &total_len);if (rc)return rc; +if (indatalen) { +/* +* indatalen is usually small at a couple of bytes max, so +* just allocate through generic pool +*/ + in_data_buf =kmalloc (indatalen,GFP_NOFS ); +if (!in_data_buf) { +cifs_small_buf_release (req); +return -ENOMEM ; + } +memcpy (in_data_buf, in_data, indatalen); + } + req->CtlCode =cpu_to_le32 (opcode); req->PersistentFileId = persistent_fid; req->VolatileFileId = volatile_fid;@@ -2563,7 +2577,7 @@ SMB2_ioctl_init(struct cifs_tcon *tcon, struct smb_rqst *rqst,cpu_to_le32 (offsetof(struct smb2_ioctl_req , Buffer)); rqst->rq_nvec =2 ; iov[0 ].iov_len = total_len -1 ; - iov[1 ].iov_base = in_data; + iov[1 ].iov_base = in_data_buf; iov[1 ].iov_len = indatalen; }else { rqst->rq_nvec =1 ;@@ -2605,8 +2619,11 @@ SMB2_ioctl_init(struct cifs_tcon *tcon, struct smb_rqst *rqst,void SMB2_ioctl_free (struct smb_rqst *rqst) { -if (rqst && rqst->rq_iov) +if (rqst && rqst->rq_iov) {cifs_small_buf_release (rqst->rq_iov[0 ].iov_base);/* request */ +if (rqst->rq_iov[1 ].iov_len) +kfree (rqst->rq_iov[1 ].iov_base); + } } --
Quoted 2 lines
2.17.1
Looks correct.
--
Best regards,
Pavel Shilovsky
Re: [PATCH 2/2] cifs: Allocate memory for all iovs in smb2_ioctl
In reply to [email protected]Quoted 55 lines · On Thu, May 16, 2019 at 7:10 AM <[email protected]> wrote:
From: Long Li <[email protected]>
An IOCTL uses up to 2 iovs. The 1st iov is the command itself, the 2nd iov is optional data for that command. The 1st iov is always allocated on the heap but the 2nd iov may point to a variable on the stack. This will trigger an error when passing the 2nd iov for RDMA I/O.
Fix this by allocating a buffer for the 2nd iov.
Signed-off-by Long Li <[email protected]>--- fs/cifs/smb2pdu.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-)fs/cifs/smb2pdu.c +15
-1@@ -2538,11 +2538,25 @@ SMB2_ioctl_init(struct cifs_tcon *tcon, struct smb_rqst *rqst,struct kvec *iov = rqst->rq_iov;unsigned int total_len;int rc; +char *in_data_buf; rc =smb2_plain_req_init (SMB2_IOCTL , tcon, (void **) &req, &total_len);if (rc)return rc; +if (indatalen) { +/* +* indatalen is usually small at a couple of bytes max, so +* just allocate through generic pool +*/ + in_data_buf =kmalloc (indatalen,GFP_NOFS ); +if (!in_data_buf) { +cifs_small_buf_release (req); +return -ENOMEM ; + } +memcpy (in_data_buf, in_data, indatalen); + } + req->CtlCode =cpu_to_le32 (opcode); req->PersistentFileId = persistent_fid; req->VolatileFileId = volatile_fid;@@ -2563,7 +2577,7 @@ SMB2_ioctl_init(struct cifs_tcon *tcon, struct smb_rqst *rqst,cpu_to_le32 (offsetof(struct smb2_ioctl_req , Buffer)); rqst->rq_nvec =2 ; iov[0 ].iov_len = total_len -1 ; - iov[1 ].iov_base = in_data; + iov[1 ].iov_base = in_data_buf; iov[1 ].iov_len = indatalen; }else { rqst->rq_nvec =1 ;
fs/cifs/smb2pdu.c SMB2_ioctl_init(struct cifs_tcon *tcon, struct smb_rqst *rqst, · line 2625
Quoted 8 lines
fs/cifs/smb2pdu.c +3
-1@@ -2605,8 +2619,11 @@ SMB2_ioctl_init(struct cifs_tcon *tcon, struct smb_rqst *rqst,void SMB2_ioctl_free (struct smb_rqst *rqst) { -if (rqst && rqst->rq_iov) +if (rqst && rqst->rq_iov) {cifs_small_buf_release (rqst->rq_iov[0 ].iov_base);/* request */ +if (rqst->rq_iov[1 ].iov_len) +kfree (rqst->rq_iov[1 ].iov_base);
You don't need the conditional. kfree(NULL) is safe,.
Quoted 7 lines
fs/cifs/smb2pdu.c +1
-1+ } } --2.17.1
Steve French
AppliedRe: [PATCH 2/2] cifs: Allocate memory for all iovs in smb2_ioctl
In reply to [email protected]merged into cifs-2.6.git for-next
Quoted 70 lines · On Wed, May 15, 2019 at 4:10 PM <[email protected]> wrote:
From: Long Li <[email protected]>
An IOCTL uses up to 2 iovs. The 1st iov is the command itself, the 2nd iov is optional data for that command. The 1st iov is always allocated on the heap but the 2nd iov may point to a variable on the stack. This will trigger an error when passing the 2nd iov for RDMA I/O.
Fix this by allocating a buffer for the 2nd iov.
Signed-off-by Long Li <[email protected]>--- fs/cifs/smb2pdu.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-)fs/cifs/smb2pdu.c +19
-3@@ -2538,11 +2538,25 @@ SMB2_ioctl_init(struct cifs_tcon *tcon, struct smb_rqst *rqst,struct kvec *iov = rqst->rq_iov;unsigned int total_len;int rc; +char *in_data_buf; rc =smb2_plain_req_init (SMB2_IOCTL , tcon, (void **) &req, &total_len);if (rc)return rc; +if (indatalen) { +/* +* indatalen is usually small at a couple of bytes max, so +* just allocate through generic pool +*/ + in_data_buf =kmalloc (indatalen,GFP_NOFS ); +if (!in_data_buf) { +cifs_small_buf_release (req); +return -ENOMEM ; + } +memcpy (in_data_buf, in_data, indatalen); + } + req->CtlCode =cpu_to_le32 (opcode); req->PersistentFileId = persistent_fid; req->VolatileFileId = volatile_fid;@@ -2563,7 +2577,7 @@ SMB2_ioctl_init(struct cifs_tcon *tcon, struct smb_rqst *rqst,cpu_to_le32 (offsetof(struct smb2_ioctl_req , Buffer)); rqst->rq_nvec =2 ; iov[0 ].iov_len = total_len -1 ; - iov[1 ].iov_base = in_data; + iov[1 ].iov_base = in_data_buf; iov[1 ].iov_len = indatalen; }else { rqst->rq_nvec =1 ;@@ -2605,8 +2619,11 @@ SMB2_ioctl_init(struct cifs_tcon *tcon, struct smb_rqst *rqst,void SMB2_ioctl_free (struct smb_rqst *rqst) { -if (rqst && rqst->rq_iov) +if (rqst && rqst->rq_iov) {cifs_small_buf_release (rqst->rq_iov[0 ].iov_base);/* request */ +if (rqst->rq_iov[1 ].iov_len) +kfree (rqst->rq_iov[1 ].iov_base); + } } --2.17.1
Signature · 3 lines
Thanks, Steve
Steve French
Appliedmerged into cifs-2.6.git for-next
Quoted 29 lines · On Wed, May 15, 2019 at 4:09 PM <[email protected]> wrote:
From: Long Li <[email protected]>
SMBDirect manages its own ports in the transport layer, there is no need to check the port to find a connection.
Signed-off-by Long Li <[email protected]>--- fs/cifs/connect.c | 4 ++++ 1 file changed, 4 insertions(+)fs/cifs/connect.c +4
-1@@ -2446,6 +2446,10 @@ match_port(struct TCP_Server_Info *server, struct sockaddr *addr) {__be16 port, *sport; +/* SMBDirect manages its own ports, don't match it here */ +if (server->rdma) +return true; +switch (addr->sa_family) {case AF_INET : sport = &((struct sockaddr_in *) &server->dstaddr)->sin_port; --2.17.1
Signature · 3 lines
Thanks, Steve