Re: [PATCH 072/190] Revert "net: atm: Reduce the severity of logging in unlink_clip_vcc"

Greg Kroah-Hartman
2021-04-28T05:30:59Z

On Wed, Apr 21, 2021 at 02:59:07PM +0200, Greg Kroah-Hartman wrote:
> This reverts commit 60f5c4aaae452ae9252128ef7f9ae222aa70c569.
>
> 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: Aditya Pakki <pakki001@umn.edu>
> Cc: David S. Miller <davem@davemloft.net>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> ---
> net/atm/clip.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/net/atm/clip.c b/net/atm/clip.c
> index 294cb9efe3d3..a7972da7235d 100644
> --- a/net/atm/clip.c
> +++ b/net/atm/clip.c
> @@ -89,7 +89,7 @@ static void unlink_clip_vcc(struct clip_vcc *clip_vcc)
> struct clip_vcc **walk;
>
> if (!entry) {
> - pr_err("!clip_vcc->entry (clip_vcc %p)\n", clip_vcc);
> + pr_crit("!clip_vcc->entry (clip_vcc %p)\n", clip_vcc);
> return;
> }
> netif_tx_lock_bh(entry->neigh->dev); /* block clip_start_xmit() */
> @@ -109,10 +109,10 @@ static void unlink_clip_vcc(struct clip_vcc *clip_vcc)
> error = neigh_update(entry->neigh, NULL, NUD_NONE,
> NEIGH_UPDATE_F_ADMIN, 0);
> if (error)
> - pr_err("neigh_update failed with %d\n", error);
> + pr_crit("neigh_update failed with %d\n", error);
> goto out;
> }
> - pr_err("ATMARP: failed (entry %p, vcc 0x%p)\n", entry, clip_vcc);
> + pr_crit("ATMARP: failed (entry %p, vcc 0x%p)\n", entry, clip_vcc);
> out:
> netif_tx_unlock_bh(entry->neigh->dev);
> }
> --
> 2.31.1
>

The original here was pointless, but did not cause a problem, so I'll
drop this revert.

greg k-h