From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x226e2GiOh2Nvw/T/bwoYyrfsfSf9+BCFDLbKcb8zKN1nRQRTawWWgMSF7mZA0904EwS/OtDM ARC-Seal: i=1; a=rsa-sha256; t=1517256256; cv=none; d=google.com; s=arc-20160816; b=g3S0ou8bRQhJrPvb0v/ApB+HPTrHTjNEhpRfrRqG+ZfMP6cv2nBM28qbeaM0MvPa10 aLYq1PTWC+VFkHqaBbJBQYATw2xuPlO9NElUSC2aEV8kUhp3vVq2fHKzTjIGGms7cK8u 4l+orGnLq/KwfBxD4auS9N91MlwfkpQ0hvXQqnI3qTFRr3mbZH001rrjifnP+tMkxU0O Sel1X91oRmhG8cLxbFx38gUP0k8LXMvikORmxGF3ARmempVE3gLIUcEiIDDWYt4yK9pb QwhsLftx88hYOUW0DAyS0TEM1TFVdEJ4RFZmdIKn9Fz7QqJqNRoAoI2PuDZJbUvjlAg7 Hmvw== 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=teK1pyrcMogZPzpbAFWilZOKTt41ulfztmVpsprjUIU=; b=aWvQz69m7J+AjfcpltpyDIh8Oyx7E7pwRiHTg5tfHlop0T9O5ea773JyZBceFFZpIC xStMPO3s5fMo1tAtcsQTkYsc7+ofskOrk01djEBtMzGjGxri3u+mJXJ/QgyzqAmOPdBA RylSzowj1rGE02E2JtndIiX9tEM7jobM0FXxd9kHCTaVXvhrjlmxdoC3r8t7efeH1Fh0 CvkoecuJAvwJTD8qOx5l4s8aR2pjahS3wWY7TQtZ7jAEisGuINqrUkm5HCpdM/yQv/sk YQ/vEuQ+fpeF1Qx2kE9gYcrWTYjEf+kZH1fjN0YG4F2A4KniIOKlwVgVK1x7tSYP7pDa FR6A== 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+e3b775f40babeff6e68b@syzkaller.appspotmail.com, Dmitry Vyukov , Oliver Hartkopp , Marc Kleine-Budde Subject: [PATCH 4.9 08/66] can: af_can: canfd_rcv(): replace WARN_ONCE by pr_warn_once Date: Mon, 29 Jan 2018 13:56:32 +0100 Message-Id: <20180129123840.266773975@linuxfoundation.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180129123839.842860149@linuxfoundation.org> References: <20180129123839.842860149@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?1590958495956024407?= X-GMAIL-MSGID: =?utf-8?q?1590958495956024407?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Marc Kleine-Budde commit d4689846881d160a4d12a514e991a740bcb5d65a upstream. If an invalid CANFD 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+e3b775f40babeff6e68b@syzkaller.appspotmail.com Suggested-by: Dmitry Vyukov Acked-by: Oliver Hartkopp Cc: linux-stable 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 @@ -745,13 +745,12 @@ static int canfd_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 != CANFD_MTU || - cfd->len > CANFD_MAX_DLEN, - "PF_CAN: dropped non conform CAN FD skbuf: " - "dev type %d, len %d, datalen %d\n", - dev->type, skb->len, cfd->len)) + if (unlikely(dev->type != ARPHRD_CAN || skb->len != CANFD_MTU || + cfd->len > CANFD_MAX_DLEN)) { + pr_warn_once("PF_CAN: dropped non conform CAN FD 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;