From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x227QQQjRUuGQfjx6QefRgpnSbyu98dxjTnH27QUUq/Erx9U128FSst8d+3S4B7LTq4EcXWPg ARC-Seal: i=1; a=rsa-sha256; t=1517256255; cv=none; d=google.com; s=arc-20160816; b=fl1FCagiCX06E+RNRrqGD/gP3mObZTZMfMmuIVwS64ImzOZUnU21e1MZsD/YK2i6tb 5gD5sP+BK7/3r3xK7YCmGzaUZtTxYSnAEJWN2o7seG32I8psAyJMs89FF41eq1o9ESuR LivYR5RTK6FkeqQVYHHAaaZ5Rlhjf2RPS3k+dCxZd39parwRJC4UqE0ONU5OhTrUdkYy mwzyUkEHhLIqzW0ROJe1+rfJHkAINDIDxaznI6vN5XsajSJaTW8KNwtWeEzblKnFJMd3 EEZf5RRWojeq+EmKKV5nulK3tGFDjDBJlSKvSnPG6TIkBDL818p9Vh+TR5grNAx4YuIY z2pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=1kGEKdiL66bS+XV9YY6omH20742qAdTgRFu1Q69wueg=; b=RV6jHRaLm6sjI8/ZCwWs4+8NdcBZu32MM9oBeBzbGayO9RiZO619vGFIN+RShu73n1 DcQ7dDRtiOgsP72YHZU0QOuFF8hRRsaKUBYZw/ffsDGyaYEgRNxwmzzbmvddZyLq1vpL itIgzLYv/mxQIborO8/+HwHxUUJTktT4kUGnos06DWxFhI4IVOH44CpoTZm8fxiPWSzZ 7aecQUrwq95FnK40woreBUwJKUPrzRfBGsGmRcwBAdbvj9wpWvGii3qVHdwPj1xRXURO kVfbAqUbqv8j4GYUY6mW6tAVRU45fDxz2G0PiUc2Sb5dyTKkFq4lwe4Wh19YyW/uuEc6 cZJQ== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot+4386709c0c1284dca827@syzkaller.appspotmail.com, Dmitry Vyukov , Oliver Hartkopp , Marc Kleine-Budde Subject: [PATCH 3.18 22/52] can: af_can: can_rcv(): replace WARN_ONCE by pr_warn_once Date: Mon, 29 Jan 2018 13:56:40 +0100 Message-Id: <20180129123629.167430126@linuxfoundation.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180129123628.168904217@linuxfoundation.org> References: <20180129123628.168904217@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1590958495106589176?= X-GMAIL-MSGID: =?utf-8?q?1590958495106589176?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Marc Kleine-Budde commit 8cb68751c115d176ec851ca56ecfbb411568c9e8 upstream. If an invalid CAN frame is received, from a driver or from a tun interface, a Kernel warning is generated. This patch replaces the WARN_ONCE by a simple pr_warn_once, so that a kernel, bootet with panic_on_warn, does not panic. A printk seems to be more appropriate here. Reported-by: syzbot+4386709c0c1284dca827@syzkaller.appspotmail.com Suggested-by: Dmitry Vyukov Acked-by: Oliver Hartkopp Signed-off-by: Marc Kleine-Budde Signed-off-by: Oliver Hartkopp Signed-off-by: Greg Kroah-Hartman --- net/can/af_can.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) --- a/net/can/af_can.c +++ b/net/can/af_can.c @@ -719,13 +719,12 @@ static int can_rcv(struct sk_buff *skb, if (unlikely(!net_eq(dev_net(dev), &init_net))) goto drop; - if (WARN_ONCE(dev->type != ARPHRD_CAN || - skb->len != CAN_MTU || - cfd->len > CAN_MAX_DLEN, - "PF_CAN: dropped non conform CAN skbuf: " - "dev type %d, len %d, datalen %d\n", - dev->type, skb->len, cfd->len)) + if (unlikely(dev->type != ARPHRD_CAN || skb->len != CAN_MTU || + cfd->len > CAN_MAX_DLEN)) { + pr_warn_once("PF_CAN: dropped non conform CAN skbuf: dev type %d, len %d, datalen %d\n", + dev->type, skb->len, cfd->len); goto drop; + } can_receive(skb, dev); return NET_RX_SUCCESS;