This is a note to let you know that I've just added the patch titled
net: dsa: ocelot: unlock on error in vsc9959_qos_port_tas_set()
to the 6.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
net-dsa-ocelot-unlock-on-error-in-vsc9959_qos_port_tas_set.patch
and it can be found in the queue-6.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From cad7526f33ce1e7d387d1d0568a089e41deec5c2 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Date: Tue, 6 Jun 2023 11:24:37 +0300
Subject: net: dsa: ocelot: unlock on error in vsc9959_qos_port_tas_set()
From: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
commit cad7526f33ce1e7d387d1d0568a089e41deec5c2 upstream.
This error path needs call mutex_unlock(&ocelot->tas_lock) before
returning.
Fixes: 2d800bc500fb ("net/sched: taprio: replace tc_taprio_qopt_offload :: enable with a "cmd" enum")
Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Reviewed-by: Vladimir Oltean <vladimir.oltean@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/net/dsa/ocelot/felix_vsc9959.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/drivers/net/dsa/ocelot/felix_vsc9959.c
+++ b/drivers/net/dsa/ocelot/felix_vsc9959.c
@@ -1449,7 +1449,8 @@ static int vsc9959_qos_port_tas_set(stru
mutex_unlock(&ocelot->tas_lock);
return 0;
} else if (taprio->cmd != TAPRIO_CMD_REPLACE) {
- return -EOPNOTSUPP;
+ ret = -EOPNOTSUPP;
+ goto err_unlock;
}
ret = ocelot_port_mqprio(ocelot, port, &taprio->mqprio);
Patches currently in stable-queue which might be from dan.carpenter@xxxxxxxxxx are
queue-6.4/tracing-probes-fix-to-avoid-double-count-of-the-string-length-on-the-array.patch
queue-6.4/net-dsa-ocelot-unlock-on-error-in-vsc9959_qos_port_tas_set.patch
queue-6.4/netdevsim-fix-uninitialized-data-in-nsim_dev_trap_fa.patch
queue-6.4/kernel-trace-fix-cleanup-logic-of-enable_trace_eprob.patch
queue-6.4/scsi-qla2xxx-fix-end-of-loop-test.patch
queue-6.4/serial-atmel-don-t-enable-irqs-prematurely.patch
queue-6.4/scsi-qla2xxx-fix-error-code-in-qla2x00_start_sp.patch
queue-6.4/tracing-probes-fix-not-to-count-error-code-to-total-length.patch
