From: Chao Yu <chao@kernel.org>
To: viro@zeniv.linux.org.uk, brauner@kernel.org,
linux-fsdevel@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Chao Yu <chao@kernel.org>
Subject: [PATCH 2/2] fs: select: reduce stack usage in do_sys_poll()
Date: Sun, 16 Jul 2023 09:07:14 +0800 [thread overview]
Message-ID: <20230716010714.3009192-2-chao@kernel.org> (raw)
In-Reply-To: <20230716010714.3009192-1-chao@kernel.org>
struct poll_wqueues table caused the stack usage of do_sys_poll() to
grow beyond the warning limit on 32-bit architectures w/ gcc.
fs/select.c: In function ‘do_sys_poll’:
fs/select.c:1053:1: warning: the frame size of 1328 bytes is larger than 1024 bytes [-Wframe-larger-than=]
Allocating dynamic memory in do_sys_poll() to fix this issue.
Signed-off-by: Chao Yu <chao@kernel.org>
---
fs/select.c | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/fs/select.c b/fs/select.c
index 1b729494b4e9..2b9db5c938d9 100644
--- a/fs/select.c
+++ b/fs/select.c
@@ -982,7 +982,7 @@ static int do_poll(struct poll_list *list, struct poll_wqueues *wait,
static int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
struct timespec64 *end_time)
{
- struct poll_wqueues table;
+ struct poll_wqueues *table;
int err = -EFAULT, fdcount, len;
/* Allocate small arguments on the stack to save memory and be
faster - use long to make sure the buffer is aligned properly
@@ -992,8 +992,14 @@ static int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
struct poll_list *walk = head;
unsigned long todo = nfds;
- if (nfds > rlimit(RLIMIT_NOFILE))
- return -EINVAL;
+ table = kmalloc(sizeof(struct poll_wqueues), GFP_KERNEL);
+ if (!table)
+ return -ENOMEM;
+
+ if (nfds > rlimit(RLIMIT_NOFILE)) {
+ err = -EINVAL;
+ goto out_table;
+ }
len = min_t(unsigned int, nfds, N_STACK_PPS);
for (;;) {
@@ -1019,9 +1025,9 @@ static int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
}
}
- poll_initwait(&table);
- fdcount = do_poll(head, &table, end_time);
- poll_freewait(&table);
+ poll_initwait(table);
+ fdcount = do_poll(head, table, end_time);
+ poll_freewait(table);
if (!user_write_access_begin(ufds, nfds * sizeof(*ufds)))
goto out_fds;
@@ -1043,7 +1049,8 @@ static int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
walk = walk->next;
kfree(pos);
}
-
+out_table:
+ kfree(table);
return err;
Efault:
--
2.40.1
next prev parent reply other threads:[~2023-07-16 1:07 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-16 1:07 [PATCH 1/2] fs: select: reduce stack usage in do_select() Chao Yu
2023-07-16 1:07 ` Chao Yu [this message]
2023-07-16 1:49 ` [PATCH 2/2] fs: select: reduce stack usage in do_sys_poll() Matthew Wilcox
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230716010714.3009192-2-chao@kernel.org \
--to=chao@kernel.org \
--cc=brauner@kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).