From: Du Cheng <ducheng2@gmail.com>
To: "David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>
Cc: netdev@vger.kernel.org,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Shuah Khan <skhan@linuxfoundation.org>,
Du Cheng <ducheng2@gmail.com>,
syzbot+3eec59e770685e3dc879@syzkaller.appspotmail.com
Subject: [PATCH v2] net:qrtr: fix atomic idr allocation in qrtr_port_assign()
Date: Sat, 27 Mar 2021 22:07:02 +0800 [thread overview]
Message-ID: <20210327140702.4916-1-ducheng2@gmail.com> (raw)
add idr_preload() and idr_preload_end() around idr_alloc_u32(GFP_ATOMIC)
due to internal use of per_cpu variables, which requires preemption
disabling/enabling.
reported as "BUG: "using smp_processor_id() in preemptible" by syzkaller
Reported-by: syzbot+3eec59e770685e3dc879@syzkaller.appspotmail.com
Signed-off-by: Du Cheng <ducheng2@gmail.com>
---
changelog
v1: change to GFP_KERNEL for idr_alloc_u32() but might sleep
v2: revert to GFP_ATOMIC but add preemption disable/enable protection
net/qrtr/qrtr.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/net/qrtr/qrtr.c b/net/qrtr/qrtr.c
index edb6ac17ceca..6361f169490e 100644
--- a/net/qrtr/qrtr.c
+++ b/net/qrtr/qrtr.c
@@ -722,17 +722,23 @@ static int qrtr_port_assign(struct qrtr_sock *ipc, int *port)
mutex_lock(&qrtr_port_lock);
if (!*port) {
min_port = QRTR_MIN_EPH_SOCKET;
+ idr_preload(GFP_ATOMIC);
rc = idr_alloc_u32(&qrtr_ports, ipc, &min_port, QRTR_MAX_EPH_SOCKET, GFP_ATOMIC);
+ idr_preload_end();
if (!rc)
*port = min_port;
} else if (*port < QRTR_MIN_EPH_SOCKET && !capable(CAP_NET_ADMIN)) {
rc = -EACCES;
} else if (*port == QRTR_PORT_CTRL) {
min_port = 0;
+ idr_preload(GFP_ATOMIC);
rc = idr_alloc_u32(&qrtr_ports, ipc, &min_port, 0, GFP_ATOMIC);
+ idr_preload_end();
} else {
min_port = *port;
+ idr_preload(GFP_ATOMIC);
rc = idr_alloc_u32(&qrtr_ports, ipc, &min_port, *port, GFP_ATOMIC);
+ idr_preload_end();
if (!rc)
*port = min_port;
}
--
2.27.0
next reply other threads:[~2021-03-27 14:08 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-27 14:07 Du Cheng [this message]
2021-03-27 14:12 ` [PATCH v2] net:qrtr: fix atomic idr allocation in qrtr_port_assign() Greg Kroah-Hartman
2021-03-27 14:25 ` Du Cheng
2021-03-27 14:31 ` Greg Kroah-Hartman
2021-03-27 15:51 ` Matthew Wilcox
2021-03-28 6:56 ` Greg Kroah-Hartman
2021-03-28 10:04 ` Matthew Wilcox
2021-03-29 10:55 ` Du Cheng
2021-03-29 11:09 ` Manivannan Sadhasivam
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=20210327140702.4916-1-ducheng2@gmail.com \
--to=ducheng2@gmail.com \
--cc=YF8bDngTPVRVx1ZY@kroah.com \
--cc=davem@davemloft.net \
--cc=gregkh@linuxfoundation.org \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=skhan@linuxfoundation.org \
--cc=syzbot+3eec59e770685e3dc879@syzkaller.appspotmail.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.