diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-04-12 08:15:27 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-04-12 08:15:27 +0200 |
| commit | 14d34d2dbbe2d9144a65bae1549202d1717062e2 (patch) | |
| tree | 8d8a84be09fa898bdfdf14e7783cd6b42d6bb0ed /net/qrtr/qrtr.c | |
| parent | usb: dwc3: qcom: Detect DWC3 DT-nodes using compatible string (diff) | |
| parent | Linux 5.12-rc7 (diff) | |
| download | linux-14d34d2dbbe2d9144a65bae1549202d1717062e2.tar.xz linux-14d34d2dbbe2d9144a65bae1549202d1717062e2.zip | |
Merge 5.12-rc7 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/qrtr/qrtr.c')
| -rw-r--r-- | net/qrtr/qrtr.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/qrtr/qrtr.c b/net/qrtr/qrtr.c index dfc820ee553a..1e4fb568fa84 100644 --- a/net/qrtr/qrtr.c +++ b/net/qrtr/qrtr.c @@ -271,7 +271,10 @@ static int qrtr_tx_wait(struct qrtr_node *node, int dest_node, int dest_port, flow = kzalloc(sizeof(*flow), GFP_KERNEL); if (flow) { init_waitqueue_head(&flow->resume_tx); - radix_tree_insert(&node->qrtr_tx_flow, key, flow); + if (radix_tree_insert(&node->qrtr_tx_flow, key, flow)) { + kfree(flow); + flow = NULL; + } } } mutex_unlock(&node->qrtr_tx_lock); |