From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CFE79C282C4 for ; Mon, 4 Feb 2019 10:38:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A349F214DA for ; Mon, 4 Feb 2019 10:38:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549276714; bh=3YPHFSWUC7bCgEi9ywtv41Flyfpmv7QsCuC9VOotdB4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Dg1Kumy44U0dTYn+F78PP8i60hWnoJbDxo7HQl+20mUGHF3nsAj2OCG9bc2kIFh/P aVBSo3ku8OFGng09s1kwNIKODqKyzZXWky5DeZ3wj9E5mtsrncJDmNoPenc47+Pozz 2V7XJR/OqchtPBdCqzjGIFdDgu+elY+I5kvowwK0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729388AbfBDKic (ORCPT ); Mon, 4 Feb 2019 05:38:32 -0500 Received: from mail.kernel.org ([198.145.29.99]:35176 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729316AbfBDKi1 (ORCPT ); Mon, 4 Feb 2019 05:38:27 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C829C2176F; Mon, 4 Feb 2019 10:38:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549276706; bh=3YPHFSWUC7bCgEi9ywtv41Flyfpmv7QsCuC9VOotdB4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JotT87WmnxcgmQ+71U/TJCNoND9PuZY0uqCWcQqOxu5omTQht8QUEWHMQfqFiuqz7 9q/fUX3iqbHja+dopFALn1AfqSkNLLgYb7G8ECKnx7bDVFZF5mQxZF2acqPRxIEKZG vx4QZF9RJRviufSX4s3L7hDGp+y1OnG42nY8AzXM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Bernard Pidoux , Dmitry Vyukov , syzbot+1a2c456a1ea08fa5b5f7@syzkaller.appspotmail.com, "David S. Miller" , Ralf Baechle , linux-hams@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH 3.18 20/31] net/rose: fix NULL ax25_cb kernel panic Date: Mon, 4 Feb 2019 11:36:35 +0100 Message-Id: <20190204103602.093690397@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190204103557.903263774@linuxfoundation.org> References: <20190204103557.903263774@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Bernard Pidoux [ Upstream commit b0cf029234f9b18e10703ba5147f0389c382bccc ] When an internally generated frame is handled by rose_xmit(), rose_route_frame() is called: if (!rose_route_frame(skb, NULL)) { dev_kfree_skb(skb); stats->tx_errors++; return NETDEV_TX_OK; } We have the same code sequence in Net/Rom where an internally generated frame is handled by nr_xmit() calling nr_route_frame(skb, NULL). However, in this function NULL argument is tested while it is not in rose_route_frame(). Then kernel panic occurs later on when calling ax25cmp() with a NULL ax25_cb argument as reported many times and recently with syzbot. We need to test if ax25 is NULL before using it. Testing: Built kernel with CONFIG_ROSE=y. Signed-off-by: Bernard Pidoux Acked-by: Dmitry Vyukov Reported-by: syzbot+1a2c456a1ea08fa5b5f7@syzkaller.appspotmail.com Cc: "David S. Miller" Cc: Ralf Baechle Cc: Bernard Pidoux Cc: linux-hams@vger.kernel.org Cc: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/rose/rose_route.c | 5 +++++ 1 file changed, 5 insertions(+) --- a/net/rose/rose_route.c +++ b/net/rose/rose_route.c @@ -849,6 +849,7 @@ void rose_link_device_down(struct net_de /* * Route a frame to an appropriate AX.25 connection. + * A NULL ax25_cb indicates an internally generated frame. */ int rose_route_frame(struct sk_buff *skb, ax25_cb *ax25) { @@ -866,6 +867,10 @@ int rose_route_frame(struct sk_buff *skb if (skb->len < ROSE_MIN_LEN) return res; + + if (!ax25) + return rose_loopback_queue(skb, NULL); + frametype = skb->data[2]; lci = ((skb->data[0] << 8) & 0xF00) + ((skb->data[1] << 0) & 0x0FF); if (frametype == ROSE_CALL_REQUEST &&