From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x2248+NG04S3PsGwJaUfCESYhV7KBuSdDXCt8U6yqjFxx5NM18obTPUTs2lDvxMEl6a6/RzkH ARC-Seal: i=1; a=rsa-sha256; t=1517256623; cv=none; d=google.com; s=arc-20160816; b=Xmba/1GxootTsDOnSjwaRe+pHR8YLdwjM8xi77RwmUmu1pouEUWY/9cFqi9Hw9Ns9T WTeg5JtbjPbTvr13Fi6T8mfOhNCTaE0FP18spb8j2iipuTVsVIme61V3E7RDaSZyYWJB cJneAE45NC489cSZPIDsk2YPw7MRql2oNlM/F3JFlUg6dIz3lEFzmgp4+R8FAvGqF9FB lXFEQfoM4ve7FtaBhhjkDjluARfpgdTgBA5lcON2KokEKyDBFpa7Ph61T+TB9SGkQXgv Fp98UwWHF51UDbZCjmxR6VdqAUPG2ogmPt+K7AyKPTZFfoc6afE6MOsVR+mKNpfLVaru Kcog== 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=sEeY3q9eCAIHSrgXYXRiB/E5jw+JFEhJlmSudmAZTcg=; b=M83Akcc7MUf7HgFT265EZMS4uO3uWn+osJLd86brTH+jKs0lN79nXkXmHjTFMBTu6f bC9R7PSGfhsCdcF3/yUr7upSOVtYoaakyCh9JwFknSYNynIRJr6dUIdafXij+E+gn4gQ eCrzGyWl/X2WoBykppFfDJpYpv/7S4csyY7LjkmCyBDOZFW0Bd7qqIbW5B4Rv+GynfBv +Ts9XCZSUu7M//Bj/ncDk/6UgLOpw6HAyDcfmBVbQ6z/+FifwEw1s0kkosNM0AOLgjfk pSRNy9U90W+3I6vXtHonvqCeHp54p0rEGvXZ/Phc/HcxhnVWyC1q7yG4f/JoamVv9eTk 7EHA== 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 4.4 09/74] can: af_can: can_rcv(): replace WARN_ONCE by pr_warn_once Date: Mon, 29 Jan 2018 13:56:14 +0100 Message-Id: <20180129123847.956634580@linuxfoundation.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180129123847.507563674@linuxfoundation.org> References: <20180129123847.507563674@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?1590958880810496473?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.4-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 @@ -722,13 +722,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;