net: qrtr: Allocate workqueue before kernel_bind
Subsystems (4)
PATCH 1/1 net: qrtr: Allocate workqueue before kernel_bind
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.
--- net/qrtr/ns.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
net/qrtr/ns.c +5 -5
@@ -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;
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Quoted 11 lines · Chris Lew
A null pointer dereference in
qrtr_ns_data_ready()is seen if a client opens a qrtr socket beforeqrtr_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 inDEL_CLIENTpackets being sent to the ns andqrtr_ns_data_ready()being called without the workqueue being allocated.Allocate the workqueue before setting
sk_data_readyand binding to the control port. This ensures that the work and workqueue structs are allocated and initialized beforeqrtr_ns_data_readycan be called.
Regards,
Bjorn
Quoted 44 lines
Fixes 0c2204a4ad71 ("net: qrtr: Migrate nameservice to kernel from userspace")Signed-off-by Chris Lew <[email protected]>--- net/qrtr/ns.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)net/qrtr/ns.c +5
-5@@ -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;Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Quoted 7 lines · Chris Lew
A null pointer dereference in
qrtr_ns_data_ready()is seen if a client opens a qrtr socket beforeqrtr_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 inDEL_CLIENTpackets being sent to the ns andqrtr_ns_data_ready()being called without the workqueue being allocated.
Quoted 6 lines
Allocate the workqueue before setting
sk_data_readyand binding to the control port. This ensures that the work and workqueue structs are allocated and initialized beforeqrtr_ns_data_readycan be called.Fixes 0c2204a4ad71 ("net: qrtr: Migrate nameservice to kernel from userspace")Signed-off-by Chris Lew <[email protected]>
Thanks,
Mani
Quoted 42 lines
--- net/qrtr/ns.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)net/qrtr/ns.c +5
-5@@ -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;Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
From: Chris Lew <[email protected]>
Date: Thu, 28 May 2020 16:05:26 -0700
Quoted 7 lines
A null pointer dereference in
qrtr_ns_data_ready()is seen if a client opens a qrtr socket beforeqrtr_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 inDEL_CLIENTpackets being sent to the ns andqrtr_ns_data_ready()being called without the workqueue being allocated.
Quoted 6 lines
Allocate the workqueue before setting
sk_data_readyand binding to the control port. This ensures that the work and workqueue structs are allocated and initialized beforeqrtr_ns_data_readycan be called.Fixes 0c2204a4ad71 ("net: qrtr: Migrate nameservice to kernel from userspace")Signed-off-by Chris Lew <[email protected]>
Applied, thank you.