From: Bjorn Andersson <bjorn.andersson@linaro.org>
To: Chris Lew <clew@codeaurora.org>
Cc: davem@davemloft.net, manivannan.sadhasivam@linaro.org,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-msm@vger.kernel.org
Subject: Re: [PATCH] net: qrtr: Allocate workqueue before kernel_bind
Date: Thu, 28 May 2020 18:19:03 -0700 [thread overview]
Message-ID: <20200529011903.GK279327@builder.lan> (raw)
In-Reply-To: <1590707126-16957-1-git-send-email-clew@codeaurora.org>
On Thu 28 May 16:05 PDT 2020, Chris Lew wrote:
> A null pointer dereference in qrtr_ns_data_ready() is seen if a client
> opens a qrtr socket before qrtr_ns_init() can bind to the control port.
> When the control port is bound, the ENETRESET error will be broadcasted
> and clients will close their sockets. This results in DEL_CLIENT
> packets being sent to the ns and qrtr_ns_data_ready() being called
> without the workqueue being allocated.
>
> Allocate the workqueue before setting sk_data_ready and binding to the
> control port. This ensures that the work and workqueue structs are
> allocated and initialized before qrtr_ns_data_ready can be called.
>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Regards,
Bjorn
> Fixes: 0c2204a4ad71 ("net: qrtr: Migrate nameservice to kernel from userspace")
> Signed-off-by: Chris Lew <clew@codeaurora.org>
> ---
> net/qrtr/ns.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/net/qrtr/ns.c b/net/qrtr/ns.c
> index e7d0fe3f4330..c5b3202a14ca 100644
> --- a/net/qrtr/ns.c
> +++ b/net/qrtr/ns.c
> @@ -712,6 +712,10 @@ void qrtr_ns_init(void)
> goto err_sock;
> }
>
> + qrtr_ns.workqueue = alloc_workqueue("qrtr_ns_handler", WQ_UNBOUND, 1);
> + if (!qrtr_ns.workqueue)
> + goto err_sock;
> +
> qrtr_ns.sock->sk->sk_data_ready = qrtr_ns_data_ready;
>
> sq.sq_port = QRTR_PORT_CTRL;
> @@ -720,17 +724,13 @@ void qrtr_ns_init(void)
> ret = kernel_bind(qrtr_ns.sock, (struct sockaddr *)&sq, sizeof(sq));
> if (ret < 0) {
> pr_err("failed to bind to socket\n");
> - goto err_sock;
> + goto err_wq;
> }
>
> qrtr_ns.bcast_sq.sq_family = AF_QIPCRTR;
> qrtr_ns.bcast_sq.sq_node = QRTR_NODE_BCAST;
> qrtr_ns.bcast_sq.sq_port = QRTR_PORT_CTRL;
>
> - qrtr_ns.workqueue = alloc_workqueue("qrtr_ns_handler", WQ_UNBOUND, 1);
> - if (!qrtr_ns.workqueue)
> - goto err_sock;
> -
> ret = say_hello(&qrtr_ns.bcast_sq);
> if (ret < 0)
> goto err_wq;
> --
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
> a Linux Foundation Collaborative Project
>
next prev parent reply other threads:[~2020-05-29 1:20 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-28 23:05 [PATCH] net: qrtr: Allocate workqueue before kernel_bind Chris Lew
2020-05-29 1:19 ` Bjorn Andersson [this message]
2020-05-29 8:46 ` Manivannan Sadhasivam
2020-05-31 4:43 ` David Miller
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=20200529011903.GK279327@builder.lan \
--to=bjorn.andersson@linaro.org \
--cc=clew@codeaurora.org \
--cc=davem@davemloft.net \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=manivannan.sadhasivam@linaro.org \
--cc=netdev@vger.kernel.org \
/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).