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.2 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 A945EC432C0 for ; Tue, 19 Nov 2019 16:13:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7D77E223AE for ; Tue, 19 Nov 2019 16:13:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=kernel-dk.20150623.gappssmtp.com header.i=@kernel-dk.20150623.gappssmtp.com header.b="Y5yP5yxk" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728106AbfKSQNj (ORCPT ); Tue, 19 Nov 2019 11:13:39 -0500 Received: from mail-io1-f66.google.com ([209.85.166.66]:36299 "EHLO mail-io1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727509AbfKSQNi (ORCPT ); Tue, 19 Nov 2019 11:13:38 -0500 Received: by mail-io1-f66.google.com with SMTP id s3so23846659ioe.3 for ; Tue, 19 Nov 2019 08:13:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20150623.gappssmtp.com; s=20150623; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=CuQtXznqoyz5kssTjNmYau458WwEA/pCkBJj2OVVqhw=; b=Y5yP5yxkELILFBRuBu782FQosIibbXWrJ8k7FKQ7MfRe6h15lWXrRvR/RpmAanLRyb sOHSEKJc89xwSjmr0aegjdhW95nfNpI0UBLLh/Dod62dh7jjr0LmY5JpGhIWiQFzl4TD TqqIeS4cy8gEAvmpofDPnro5dCnkUcrWaIFQ5SNWHTKLsb1snDYcJaA15KuscmjBbAis aU3lD8Ws7FIG/mm/iqeJvgZaE3kh+ku6pu5ubn37PAFNRkVs9omWdk3Txfk8JteJpZBr keK4Ips74YC+7A92ul65nGHBp+l0JtVT6IBmXKVW70OM9pqqrn0Pf4YuMMHNaOcwr9kj 3/gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=CuQtXznqoyz5kssTjNmYau458WwEA/pCkBJj2OVVqhw=; b=ZO+hT5X27vEndtYdHCDIt4xgH9FgkmxMlqs04A+Mf6hgyfyGfesMdYQVF3FC6sdZeS mW5X4ZqOfGfJXcS7mZy5tuHW/EUKOlp6VArS1Ss+xCe09OeqkscY2mfShTMeOmfOR8g6 TcAESW3XR6xu0Dg712hb1nwtPVNQ3G/+rq8hOCnL4ovFcaET0A/JZIf7uCe5+4yx/ra8 NUPtViqiN23TgmNlY9rTFLiP7YcDCggvZW4yrcmwNGfwlHjy2Zps5Bh3mtL0pxxpzPuj Ea3drQmExB6giEsKemV/EJhYE+DigJ+jXYkncG+CIEJftJIQsaoyBKbnahCWN5IxCMeh 7d2w== X-Gm-Message-State: APjAAAU9C4u11xRJlQkdJQnXKI+yjSBSjRH8OscS1UftgE+5i6QadbCf zjQFpnWyjyCuKc1mvcrj3BBGWg== X-Google-Smtp-Source: APXvYqyrsEqORsYQXRnAbGvk2VKAQluxp4RFlBrdGsPXjw9zQza5QmSohcjFAyNMdDM3atBr+47PwQ== X-Received: by 2002:a05:6602:251a:: with SMTP id i26mr18935296ioe.302.1574180016622; Tue, 19 Nov 2019 08:13:36 -0800 (PST) Received: from [192.168.1.159] ([65.144.74.34]) by smtp.gmail.com with ESMTPSA id t11sm5546611ild.38.2019.11.19.08.13.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Nov 2019 08:13:35 -0800 (PST) Subject: Re: [v2] nbd:fix memory leak in nbd_get_socket() To: Sun Ke , josef@toxicpanda.com, linux-block@vger.kernel.org, nbd@other.debian.org, linux-kernel@vger.kernel.org Cc: Mike Christie References: <1574143751-138680-1-git-send-email-sunke32@huawei.com> From: Jens Axboe Message-ID: Date: Tue, 19 Nov 2019 09:13:34 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <1574143751-138680-1-git-send-email-sunke32@huawei.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org On 11/18/19 11:09 PM, Sun Ke wrote: > Before return NULL,put the sock first. > > Cc: stable@vger.kernel.org > Fixes: cf1b2326b734 ("nbd: verify socket is supported during setup") > Signed-off-by: Sun Ke Please always CC the author of the patch you're fixing. Mike, Josef - we probably need to get this upstream ASAP. > --- > v2: add cc:stable tag > --- > drivers/block/nbd.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c > index a94ee45..19e7599 100644 > --- a/drivers/block/nbd.c > +++ b/drivers/block/nbd.c > @@ -993,6 +993,7 @@ static struct socket *nbd_get_socket(struct nbd_device *nbd, unsigned long fd, > if (sock->ops->shutdown == sock_no_shutdown) { > dev_err(disk_to_dev(nbd->disk), "Unsupported socket: shutdown callout must be supported.\n"); > *err = -EINVAL; > + sockfd_put(sock); > return NULL; > } > > -- Jens Axboe