Skip to content

Commit 933148a

Browse files
Paulo Alcantarasmfrench
authored andcommitted
smb: client: reduce stack usage in smb_send_rqst()
Clang warns about exceeded stack frame size fs/smb/client/transport.c:420:1: warning: stack frame size (1048) exceeds limit (1024) in 'smb_send_rqst' [-Wframe-larger-than] Fix this by allocating a structure that will hold transform header and compound requests. Signed-off-by: Paulo Alcantara (SUSE) <[email protected]> Signed-off-by: Steve French <[email protected]>
1 parent 946ad1b commit 933148a

File tree

1 file changed

+17
-12
lines changed

1 file changed

+17
-12
lines changed

fs/smb/client/transport.c

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -416,13 +416,19 @@ __smb_send_rqst(struct TCP_Server_Info *server, int num_rqst,
416416
return rc;
417417
}
418418

419+
struct send_req_vars {
420+
struct smb2_transform_hdr tr_hdr;
421+
struct smb_rqst rqst[MAX_COMPOUND];
422+
struct kvec iov;
423+
};
424+
419425
static int
420426
smb_send_rqst(struct TCP_Server_Info *server, int num_rqst,
421427
struct smb_rqst *rqst, int flags)
422428
{
423-
struct kvec iov;
424-
struct smb2_transform_hdr *tr_hdr;
425-
struct smb_rqst cur_rqst[MAX_COMPOUND];
429+
struct send_req_vars *vars;
430+
struct smb_rqst *cur_rqst;
431+
struct kvec *iov;
426432
int rc;
427433

428434
if (!(flags & CIFS_TRANSFORM_REQ))
@@ -436,16 +442,15 @@ smb_send_rqst(struct TCP_Server_Info *server, int num_rqst,
436442
return -EIO;
437443
}
438444

439-
tr_hdr = kzalloc(sizeof(*tr_hdr), GFP_NOFS);
440-
if (!tr_hdr)
445+
vars = kzalloc(sizeof(*vars), GFP_NOFS);
446+
if (!vars)
441447
return -ENOMEM;
448+
cur_rqst = vars->rqst;
449+
iov = &vars->iov;
442450

443-
memset(&cur_rqst[0], 0, sizeof(cur_rqst));
444-
memset(&iov, 0, sizeof(iov));
445-
446-
iov.iov_base = tr_hdr;
447-
iov.iov_len = sizeof(*tr_hdr);
448-
cur_rqst[0].rq_iov = &iov;
451+
iov->iov_base = &vars->tr_hdr;
452+
iov->iov_len = sizeof(vars->tr_hdr);
453+
cur_rqst[0].rq_iov = iov;
449454
cur_rqst[0].rq_nvec = 1;
450455

451456
rc = server->ops->init_transform_rq(server, num_rqst + 1,
@@ -456,7 +461,7 @@ smb_send_rqst(struct TCP_Server_Info *server, int num_rqst,
456461
rc = __smb_send_rqst(server, num_rqst + 1, &cur_rqst[0]);
457462
smb3_free_compound_rqst(num_rqst, &cur_rqst[1]);
458463
out:
459-
kfree(tr_hdr);
464+
kfree(vars);
460465
return rc;
461466
}
462467

0 commit comments

Comments
 (0)