| Message ID | YIAnKtpJa/K+0efq@mwanda (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 53e35ebb9a17fd953d9b8fe059aaf4282fa524f2 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] stmmac: intel: unlock on error path in intel_crosststamp() | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | warning | 1 maintainers not CCed: linux-arm-kernel@lists.infradead.org |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 7 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
On Wed, Apr 21, 2021 at 04:22:50PM +0300, Dan Carpenter wrote: > We recently added some new locking to this function but one error path > was overlooked. We need to drop the lock before returning. > > Fixes: f4da56529da6 ("net: stmmac: Add support for external trigger timestamping") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by: Wong Vee Khee <vee.khee.wong@linux.intel.com>
Hello: This patch was applied to netdev/net-next.git (refs/heads/master): On Wed, 21 Apr 2021 16:22:50 +0300 you wrote: > We recently added some new locking to this function but one error path > was overlooked. We need to drop the lock before returning. > > Fixes: f4da56529da6 ("net: stmmac: Add support for external trigger timestamping") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > --- > drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 1 + > 1 file changed, 1 insertion(+) Here is the summary with links: - [net-next] stmmac: intel: unlock on error path in intel_crosststamp() https://git.kernel.org/netdev/net-next/c/53e35ebb9a17 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c index ec140fc4a0f5..bd662aaf664a 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c @@ -320,6 +320,7 @@ static int intel_crosststamp(ktime_t *device, acr_value |= PTP_ACR_ATSEN3; break; default: + mutex_unlock(&priv->aux_ts_lock); return -EINVAL; } writel(acr_value, ptpaddr + PTP_ACR);
We recently added some new locking to this function but one error path was overlooked. We need to drop the lock before returning. Fixes: f4da56529da6 ("net: stmmac: Add support for external trigger timestamping") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> --- drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 1 + 1 file changed, 1 insertion(+)