lkml.org 
[lkml]   [2021]   [Apr]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 168/190] Revert "net: marvell: fix a missing check of acpi_match_device"
    On Wed, Apr 21, 2021 at 03:00:43PM +0200, Greg Kroah-Hartman wrote:
    > This reverts commit 92ee77d148bf06d8c52664be4d1b862583fd5c0e.
    >
    > 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 published at 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).
    >
    > 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: Kangjie Lu <kjlu@umn.edu>
    > Cc: David S. Miller <davem@davemloft.net>
    > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    > ---
    > drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 2 --
    > 1 file changed, 2 deletions(-)
    >
    > diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
    > index 1767c60056c5..f1a70b37227f 100644
    > --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
    > +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
    > @@ -7328,8 +7328,6 @@ static int mvpp2_probe(struct platform_device *pdev)
    > if (has_acpi_companion(&pdev->dev)) {
    > acpi_id = acpi_match_device(pdev->dev.driver->acpi_match_table,
    > &pdev->dev);
    > - if (!acpi_id)
    > - return -EINVAL;
    > priv->hw_version = (unsigned long)acpi_id->driver_data;
    > } else {
    > priv->hw_version =
    > --
    > 2.31.1
    >

    The original commit here looks correct, so I'll drop this revert.

    greg k-h

    \
     
     \ /
      Last update: 2021-04-27 16:52    [W:2.246 / U:0.532 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site