From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x227hpIjc3/42ENB3bdz24qPaBroOXrS2yGNbiHtkWta1fCe0WahOXQniV/atK7Yb7hpFtmqP ARC-Seal: i=1; a=rsa-sha256; t=1516611176; cv=none; d=google.com; s=arc-20160816; b=FnISyQNp+P0Taioo0ea/NZpvoQ7dSLn6azLRw/jCT7rJESFz8HxplF12ks5xxg2xdW Rggv2fxpHNfzONpGTSojXk+WEIG5caM8x7NKdQKzL5xHnuAFVlTEXyOxtuzLVK5LFBdk g3WqHxEQSCm5zero3rbta+VmHb9iVYuw/Czh93EwsdHgiac3FU2I5Q87yLhV3Xy9hY4N pa1PNDADvdKwAzBennHQ7328PCHMIexXorglw03tQifrgp7VTzjYWsq7wmKKjQzfnEZn /yrpbsxnLoiVqOJmElWff4LBM+HE7qrK0o9VQr3kpvOIy2p0NmCNbeg0LuIluqozA/tg /rqg== 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=FmEYQo5uYBXm9lEX+pVuQy3Yc4NygKX49GbM3ESkzww=; b=v6z0K+KUoB0PD2Ubyof2Tn1mTJjb3PNFocvdPamZcrOS/1r5Z/r8pw0oh0mTbRfuID a9AL1DHu6XJac1ykFU9ON/L4EP8aE8HB1HfpSE7213T8vgVYr22tGbyerJK+A+jH0ZAD 4CHWEIc9kyd3KG2dIy/WGqCPQVn+Mb7jNlO/ZnJd44DK+eHPnmQc51DvDBY/oZoeSrk2 i5ACTd3ILw08SJtMV4IZLNlttJSaIxWh/Wu3ediQBfSxvCgIRUg1xizVuvveCKJiWK+3 v0sqQfVmx1zC2ALF+UhGxMRi8AQz2pP/CnGfX5al2O3w1ZnF7wcnr1fE7Uj2lG9jGvKs 7ORA== 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.14 62/89] can: af_can: canfd_rcv(): replace WARN_ONCE by pr_warn_once Date: Mon, 22 Jan 2018 09:45:42 +0100 Message-Id: <20180122084000.810183613@linuxfoundation.org> X-Mailer: git-send-email 2.16.0 In-Reply-To: <20180122083954.683903493@linuxfoundation.org> References: <20180122083954.683903493@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?1590282081059757553?= X-GMAIL-MSGID: =?utf-8?q?1590282081059757553?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.14-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 Signed-off-by: Marc Kleine-Budde Signed-off-by: Greg Kroah-Hartman --- net/can/af_can.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) --- a/net/can/af_can.c +++ b/net/can/af_can.c @@ -738,20 +738,16 @@ static int canfd_rcv(struct sk_buff *skb { struct canfd_frame *cfd = (struct canfd_frame *)skb->data; - 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)) - goto drop; + 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); + kfree_skb(skb); + return NET_RX_DROP; + } can_receive(skb, dev); return NET_RX_SUCCESS; - -drop: - kfree_skb(skb); - return NET_RX_DROP; } /*