Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp814866pxb; Wed, 11 Nov 2020 17:37:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJyQFFnpCkhq6OVt475uopj0h844x8Hl7JYTqYqawjV5VJLYceeKCmmPLH61mJoo7DR7khzj X-Received: by 2002:a17:907:c05:: with SMTP id ga5mr22716114ejc.212.1605145032471; Wed, 11 Nov 2020 17:37:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605145032; cv=none; d=google.com; s=arc-20160816; b=CGo4s+Bu0wMKpeDjtik+g2LPGL77gjPwZK7wqVZepRhDW+9bt27VU/2RHBlxVcdsM+ WTbqd5NPnZ9sPfzuKEszJ/zJFZsTGHfAfuU9dS4yqYedYiY5m17LVsUpCjww4IGI44py E0j9lj9rp8nT0LWy3KAYKBSpgzsMi44JvEAlPrHOB1zsfwTM11WKPInn4aQ/67sDkv6p cbSZQmqFHv0VKV7oaPj7hb3sSa5mk8w4FL/Y4P3xaBbsmT+csvuo7BSYeralA8wmo3h+ 6J3jz+KrPTAyWzd2m4GSXeHkwZcLJB7k7qjjvRt1v5dft5nx7rcGnZn/i1sGs7SMz0Yb NTAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:subject:cc:to:from:date :dkim-signature; bh=jZ+RZrGSU1mkEmAcvfXH8GXPB7X26D/tCi65It3X1YM=; b=VCEQDMqqKjQLqsW0e7lz6e3Ru8Iii0SwqmZuLK8NvEcOjij4m6+ja0DVlE04VnLvZM 4RBtOV7tAzKG5/sz+MAlJYSVLZciIdsCCKOTDoM9HGQjx9lMPoaVHE2V53c8wDjZHvgC 9hzyHF17PaN6CNJG3KRmjIWh35oexby58H/qLUavGiXB5EESdee9YFAq6+rEV8saIaGk vZktCNmX9YjM1Q98PP0JzNmcLqhar3vDic4v2GIAyx80nq83XPJIsu2E0ZVXX28XZcgx ZF/hRoo+G/PPz/uMK3lwPajUmIEatXGFxoJJDT0VdTs43T1mXJce/qSd9OoqXt1LFug5 0CFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=cF4wZi47; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id dm25si2595516edb.238.2020.11.11.17.36.48; Wed, 11 Nov 2020 17:37:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=cF4wZi47; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728691AbgKLBeC (ORCPT + 99 others); Wed, 11 Nov 2020 20:34:02 -0500 Received: from mail.kernel.org ([198.145.29.99]:46308 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727535AbgKKW5W (ORCPT ); Wed, 11 Nov 2020 17:57:22 -0500 Received: from kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com (unknown [163.114.132.6]) (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 7DFE22072C; Wed, 11 Nov 2020 22:57:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1605135441; bh=VPpBI4DLSnoWPj8x+lszpIP40asm1HTFF4ON1H5/z98=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=cF4wZi47/iYP9AeqaRta9P0IHiayGUJlol/cxKBQuRL7lu5c5IvH4DqaxU5jMJ7Bc abtHokQPMEMiu8IZpI5HB8DMr4esvnrTupjK0Hpj/2OeRwNZEMREvOcWTTvchWwA+A 1P1k7TMdO0u28BV41U5SJRB6aKa9Mq4M3vQGJHJY= Date: Wed, 11 Nov 2020 14:57:20 -0800 From: Jakub Kicinski To: Xie He Cc: Martin Schiller , andrew.hendry@gmail.com, davem@davemloft.net, edumazet@google.com, xiyuyang19@fudan.edu.cn, linux-x25@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [RESEND PATCH v2] net/x25: Fix null-ptr-deref in x25_connect Message-ID: <20201111145720.0c743104@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com> In-Reply-To: <20201111115947.3498-1-xie.he.0141@gmail.com> References: <20201109065449.9014-1-ms@dev.tdt.de> <20201111115947.3498-1-xie.he.0141@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 11 Nov 2020 03:59:47 -0800 Xie He wrote: > > @@ -825,7 +825,7 @@ static int x25_connect(struct socket *sock, struct sockaddr *uaddr, > > sock->state = SS_CONNECTED; > > rc = 0; > > out_put_neigh: > > - if (rc) { > > + if (rc && x25->neighbour) { > > read_lock_bh(&x25_list_lock); > > x25_neigh_put(x25->neighbour); > > x25->neighbour = NULL; > > Reviewed-by: Xie He Applied, thanks!