Re: [PATCH 2/7] Revert "rtc: mc13xxx: fix a double-unlock issue"
From: Greg Kroah-Hartman
Date: Thu Apr 29 2021 - 09:52:17 EST
On Thu, Apr 29, 2021 at 03:08:06PM +0200, Greg Kroah-Hartman wrote:
> This reverts commit 8816cd726a4fee197af2d851cbe25991ae19ea14.
>
> Commits from @umn.edu addresses have been found to be submitted in "bad
> faith" to try to test the kernel community's ability to review "known
> malicious" changes. The result of these submissions can be found in a
> paper submitted to the 42nd IEEE Symposium on Security and Privacy
> entitled, "Open Source Insecurity: Stealthily Introducing
> Vulnerabilities via Hypocrite Commits" written by Qiushi Wu (University
> of Minnesota) and Kangjie Lu (University of Minnesota) but later
> withdrawn.
>
> Because of this, all submissions from this group must be reverted from
> the kernel tree and will need to be re-reviewed again to determine if
> they actually are a valid fix. Until that work is complete, remove this
> change to ensure that no problems are being introduced into the
> codebase.
>
> Cc: Qiushi Wu <wu000273@xxxxxxx>
> Cc: Alexandre Belloni <alexandre.belloni@xxxxxxxxxxx>
> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> ---
> drivers/rtc/rtc-mc13xxx.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/rtc/rtc-mc13xxx.c b/drivers/rtc/rtc-mc13xxx.c
> index d4234e78497e..0921ca792847 100644
> --- a/drivers/rtc/rtc-mc13xxx.c
> +++ b/drivers/rtc/rtc-mc13xxx.c
> @@ -308,10 +308,8 @@ static int __init mc13xxx_rtc_probe(struct platform_device *pdev)
> mc13xxx_unlock(mc13xxx);
>
> ret = devm_rtc_register_device(priv->rtc);
> - if (ret) {
> - mc13xxx_lock(mc13xxx);
> + if (ret)
> goto err_irq_request;
> - }
>
> return 0;
>
> --
> 2.31.1
>
The original change here looks correct to me, I'll drop this revert from
my tree.
thanks,
greg k-h