lkml.org 
[lkml]   [2021]   [Apr]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 173/190] Revert "niu: fix missing checks of niu_pci_eeprom_read"
    Date
    This reverts commit 26fd962bde0b15e54234fe762d86bc0349df1de4.

    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: Shannon Nelson <shannon.lee.nelson@gmail.com>
    Cc: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/sun/niu.c | 10 ++--------
    1 file changed, 2 insertions(+), 8 deletions(-)

    diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c
    index 707ccdd03b19..d70cdea756d1 100644
    --- a/drivers/net/ethernet/sun/niu.c
    +++ b/drivers/net/ethernet/sun/niu.c
    @@ -8097,8 +8097,6 @@ static int niu_pci_vpd_scan_props(struct niu *np, u32 start, u32 end)
    start += 3;

    prop_len = niu_pci_eeprom_read(np, start + 4);
    - if (prop_len < 0)
    - return prop_len;
    err = niu_pci_vpd_get_propname(np, start + 5, namebuf, 64);
    if (err < 0)
    return err;
    @@ -8143,12 +8141,8 @@ static int niu_pci_vpd_scan_props(struct niu *np, u32 start, u32 end)
    netif_printk(np, probe, KERN_DEBUG, np->dev,
    "VPD_SCAN: Reading in property [%s] len[%d]\n",
    namebuf, prop_len);
    - for (i = 0; i < prop_len; i++) {
    - err = niu_pci_eeprom_read(np, off + i);
    - if (err >= 0)
    - *prop_buf = err;
    - ++prop_buf;
    - }
    + for (i = 0; i < prop_len; i++)
    + *prop_buf++ = niu_pci_eeprom_read(np, off + i);
    }

    start += len;
    --
    2.31.1
    \
     
     \ /
      Last update: 2021-04-21 15:20    [W:4.779 / U:0.184 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site