From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x225mbY5/atnGthi8Jp9P2VH2d8WhqQXZRovMqQMLknODZzihD15UI5KuwANhc3kmiLWirdcZ ARC-Seal: i=1; a=rsa-sha256; t=1517256754; cv=none; d=google.com; s=arc-20160816; b=znpj/VB2PJ1wYYwvad6E5FILTmaknR5/cwPbdg3Ob/RLM6D0bLCGgCc3KN2hPlz7rc +HmH82Hczu7dBpu+APiG86H7oqL7CBSOqgxcMfwIr3VVRFUAM6X2hLvVvjnc/qOAC0tH hugL9FKmPlQhTrgLfN4Q4VA2oVkPy8N+8TYtxAfap+xKPri1iLVf9buEAYjjkYSq6wTB bV7+Xrj51123TvGXLWUZ/y/VrX+kCD35NijfD4obAlnyjLdL5rhIyz7cSrGt/x7jesRP hFFy0YYkV/bgaNqgfjTLLNjKqkiynuFvLQpUSNlbsNag1lMFW5jbEQHKAWqaZLTn15h6 UcUA== 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=58YQZGMc9wJ2FWJ0hiArkwhuftc6WOlCIdI4n61QbEo=; b=hkq6nZV8ccM0tqmxPYqlNZXI3AHIl6E/hEB5fQcfjMsA84Iq+KGbrxh5ZwdQlDgFIn wtJTuaG6Tw/CDU7uO8AswFcsGfDwrAbN1pI8snYYid9wBdciRuRQLv+NfKLDav4aeJrQ Wg9sw9pVgv8NdhFI3Q0wLDIoqXeEI4+6OLkfS8Xbu/YwP2mtbTfYLr6ToT5VXEnYu1Gx fpWAmnZwNxpNbmc/8dmiDfNuRms6KQnhhrJKywXo5unlpIZBUC8OlaQD5dn1wZkgKDZD ysuUC/JqKQMgX13pAtR1Y+FOk7uemKXoT8Yb21tv/5su+rqY/pYa9YikmPjnr05MVKmI 0hHg== 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 3.18 23/52] can: af_can: canfd_rcv(): replace WARN_ONCE by pr_warn_once Date: Mon, 29 Jan 2018 13:56:41 +0100 Message-Id: <20180129123629.208690141@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?1590958495956024407?= X-GMAIL-MSGID: =?utf-8?q?1590959019158256048?= 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 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 @@ -742,13 +742,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;