diff options
| author |   Tim Gardner <tim.gardner@canonical.com> | 2013-02-13 08:40:16 -0700 |
|---|---|---|
| committer |   J. Bruce Fields <bfields@redhat.com> | 2013-02-15 11:29:38 -0500 |
| commit | f25cc71e634edcf8a15bc60a48f2b5f3ec9fbb1d (patch) | |
| tree | b66f98dacd1c095dfded8ee673290230366dd8c8 /fs/lockd/clntproc.c | |
| parent | nfsd: enable NFSv4 state in containers (diff) | |
| download | linux-dev-f25cc71e634edcf8a15bc60a48f2b5f3ec9fbb1d.tar.xz linux-dev-f25cc71e634edcf8a15bc60a48f2b5f3ec9fbb1d.zip | |
lockd: nlmclnt_reclaim(): avoid stack overflow
Even though nlmclnt_reclaim() is only one call into the stack frame,
928 bytes on the stack seems like a lot. Recode to dynamically
allocate the request structure once from within the reclaimer task,
then pass this pointer into nlmclnt_reclaim() for reuse on
subsequent calls.
smatch analysis:
fs/lockd/clntproc.c:620 nlmclnt_reclaim() warn: 'reqst' puts
928 bytes on stack
Also remove redundant assignment of 0 after memset.
Cc: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/lockd/clntproc.c')
| -rw-r--r-- | fs/lockd/clntproc.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c index 54f9e6ce0430..b43114c4332a 100644 --- a/fs/lockd/clntproc.c +++ b/fs/lockd/clntproc.c @@ -615,17 +615,15 @@ out_unlock: * RECLAIM: Try to reclaim a lock */ int -nlmclnt_reclaim(struct nlm_host *host, struct file_lock *fl) +nlmclnt_reclaim(struct nlm_host *host, struct file_lock *fl, + struct nlm_rqst *req) { - struct nlm_rqst reqst, *req; int status; - req = &reqst; memset(req, 0, sizeof(*req)); locks_init_lock(&req->a_args.lock.fl); locks_init_lock(&req->a_res.lock.fl); req->a_host = host; - req->a_flags = 0; /* Set up the argument struct */ nlmclnt_setlockargs(req, fl); |