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=-8.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_MUTT autolearn=ham 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 03956C43381 for ; Fri, 29 Mar 2019 06:18:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BDB6D2173C for ; Fri, 29 Mar 2019 06:18:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553840323; bh=Qe+aWPA30RNX97XMgQMlLZhLkFz+ScBI/3VKklAW1tU=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=VvVbc66mzj/rKzk6Y6ZHk8i043aAF6D9wNQ8sjaWK7ZIFIFhQnpwgP2FgvohsUo++ 01Fdd6gCc7HeM/jAJLh8BHlqouQqKnmThyhQzfGFU9VLqikkxjD1z6pVABqze1taMC fKo69fW8/cNBgVrievwvKhKUHW85vnRNSAfAzalo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728693AbfC2GSn (ORCPT ); Fri, 29 Mar 2019 02:18:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:46276 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726251AbfC2GSm (ORCPT ); Fri, 29 Mar 2019 02:18:42 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 7BCC72173C; Fri, 29 Mar 2019 06:18:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553840322; bh=Qe+aWPA30RNX97XMgQMlLZhLkFz+ScBI/3VKklAW1tU=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=E490DQ2bxL8+sM5MAK5ppIFVKOOOGbR9qD9XXLh+eFwj/JgNFJjVYdqnqKV1jNXCM 5R4l1zK7dBBi4k4QFTf7ATtZny3l38yul0AMWrc4/ROuOMo/2/gjs1HbbWBRAbEz+2 LbyuKjgfI+aLBu1MJxQPQydO+brdrPVcg7DHdpZM= Date: Fri, 29 Mar 2019 07:18:38 +0100 From: Greg KH To: David Miller Cc: stable@vger.kernel.org Subject: Re: [PATCHES] Networking Message-ID: <20190329061838.GA23208@kroah.com> References: <20190328.122407.1125989210145347163.davem@davemloft.net> <20190328205525.GA566@kroah.com> <20190328215149.GA21581@kroah.com> <20190328.161814.1978203886746383455.davem@davemloft.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190328.161814.1978203886746383455.davem@davemloft.net> User-Agent: Mutt/1.11.4 (2019-03-13) Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Thu, Mar 28, 2019 at 04:18:14PM -0700, David Miller wrote: > From: Greg KH > Date: Thu, 28 Mar 2019 22:51:49 +0100 > > > On Thu, Mar 28, 2019 at 09:55:25PM +0100, Greg KH wrote: > >> On Thu, Mar 28, 2019 at 12:24:07PM -0700, David Miller wrote: > >> > > >> > Please queue up the following networking bug fixes for v4.19 and v5.0 > >> > -stable, respectively. > >> > >> Now queued up, thanks. > > > > Hm, looks like the tun patch needs a call to rcu_read_unlock() in the > > error path. Should I drop that patch for now until a fix hits Linus's > > tree, or just leave it as-is for now and take the fix later? > > Hmmm, I thought I included the: > > >From 9180bb4f046064dfa4541488102703b402bb04e1 Mon Sep 17 00:00:00 2001 > From: Eric Dumazet > Date: Sat, 16 Mar 2019 13:09:53 -0700 > Subject: [PATCH] tun: add a missing rcu_read_unlock() in error path > > [ Upstream commit 9180bb4f046064dfa4541488102703b402bb04e1 ] > > In my latest patch I missed one rcu_read_unlock(), in case > device is down. > > Fixes: 4477138fa0ae ("tun: properly test for IFF_UP") > Signed-off-by: Eric Dumazet > Reported-by: syzbot > Signed-off-by: David S. Miller > --- > drivers/net/tun.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/net/tun.c b/drivers/net/tun.c > index 0d343359f647..e9ca1c088d0b 100644 > --- a/drivers/net/tun.c > +++ b/drivers/net/tun.c > @@ -1960,6 +1960,7 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile, > rcu_read_lock(); > if (unlikely(!(tun->dev->flags & IFF_UP))) { > err = -EIO; > + rcu_read_unlock(); > goto drop; > } > > -- > 2.20.1 Wonderful, thanks for this, now queued up. greg k-h