Received: by 2002:a5b:505:0:0:0:0:0 with SMTP id o5csp5433675ybp; Mon, 14 Oct 2019 22:40:23 -0700 (PDT) X-Google-Smtp-Source: APXvYqymueIMvuj7bsK5izB8xwL7zra6GaexS9tstTq2a96T5N51+gZzStt5FGP/ZUmUncPdOrYN X-Received: by 2002:a17:906:ca50:: with SMTP id jx16mr32303197ejb.33.1571118023482; Mon, 14 Oct 2019 22:40:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571118023; cv=none; d=google.com; s=arc-20160816; b=I73ksF3Qvwj84LGEpH4I9dUarTe35oeZIR9UwuApjqVvMnEQO8SdSVndDn02O6Sq+G 8ryN8tuKHbR2Jwsl9YQHF1HHXgfWk2QYFQ1WfEHalEa8QTKFO0+h+qj7FHoO3+TidqkJ HFggGKBFthJXn4+Cx3cuIOsm0wB8VAG34IkUglwerhyMLH9mHXY927cyD7wagUXiXR7P LxMsC3FbU/vxaWo/8ugFnYhDnlztsQ20iIlrm0y4gsJE49sBApHR+yXRsMrfgEoVU2n0 zXz1MEkCZzXAF9dfh55WfT1rGVLS+zTalD0p5mB1TD0X9PPuaziW1tRESFhxgEyUaawj KisA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:cc:to:subject :message-id:date:from:in-reply-to:references:mime-version :dkim-signature; bh=FoyKK6+CZHtzLvyc+hXa9rZT9/61RNMGYHQKvCgAsn8=; b=AkPguk7DETl3ZWbQY/n3uR0StqMBJIk/qEfy2W490mtvkENFIfTwcmlD4qVkPjvPlE 7m9iE1VlQP+NgAk3SI3h/fGXBD1fQ0zByUXXWmyn9DTtgtwcQE2KY8Uht1IkEiIM7bFx FwX+ILrOmP1NM+r2sLZETzNTqyLrHuU4yK5MJ8ULL4Erv8wAdKL4EnXSK1sfryjEGKLD U5I0LGqnpeM6TbstjZu+/AvYhpEZR8zErQy9FkGfNc3L6TDaiQPGOS7/n1sLb4DNsHMZ X+3aYMckR4YEb8pZ7niIICo3ZWUfgQGiYUb7RQwuZcxYzvRaGpTp0m5AZEGSvv5PPAWf PkcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=da1+odWx; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w54si15660681edd.427.2019.10.14.22.39.59; Mon, 14 Oct 2019 22:40:23 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=da1+odWx; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728103AbfJOExv (ORCPT + 99 others); Tue, 15 Oct 2019 00:53:51 -0400 Received: from mail-io1-f65.google.com ([209.85.166.65]:46053 "EHLO mail-io1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727959AbfJOExv (ORCPT ); Tue, 15 Oct 2019 00:53:51 -0400 Received: by mail-io1-f65.google.com with SMTP id c25so42887005iot.12; Mon, 14 Oct 2019 21:53:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=FoyKK6+CZHtzLvyc+hXa9rZT9/61RNMGYHQKvCgAsn8=; b=da1+odWxWl7gUFhDl9t6DAPPjvv49NvV4J800iLoARhJP8025HZn3Kxd/DL6c6uO8P GFWRHn1nDwbjzHP+Fy5RLnWWBYInr8ZrFkwjETeXTznLEa6Mrf3oTePwZie/0zzI3pq8 3H556MItZnzFM0oZIjoEL2ydVfi+OEpbzBIkpW9E1PGbwFNf2MMU/kKgQ6aRozQRiQIm ygkRH2h/xDqS2hvCa1UD0WRTidtODYmBjAnoBRKHvdEMZmoPnufZNxqLzh2MKuoLocHb 7ZrwAP92LrsOk1ywJCXH6FKRFORrdKoRtUNICv1A69XGGWNgjAjD6us1nCtDSsPDvszE SQeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=FoyKK6+CZHtzLvyc+hXa9rZT9/61RNMGYHQKvCgAsn8=; b=XUeanHdwJ+UV1GKqS3qvFEpi1OLMs7nNtA7f/mqjm8I9hqycx83xmkp8H2yNJkBo5x nB5Fdsiat48Ye3yvK0q0VQW1mV7FDbTBnPsRtEQuietbgqA6jpglYRrgEWI6KGq4Odfy sbcrpsWT8i/JyS1e88fMtxC2Q6gVgMXluJUV6NiXc8QIPlWWCrSjkhu6wdyVvsDq/Yhv adT8eu6K8CMYFRClZSGACKRVcomSylMTe9/3NeyUG4HeXhnAHMRivb6H/eaqMBRTR4B4 txzr4ao8Yo4n0mp+rSlm7vtu69em0FP4eyURO9clEbZJ7TkGJt+/yIf4mYN/Hhy5HVPW 6YgA== X-Gm-Message-State: APjAAAWE/tx11O7I/LrSWgA+PbWPk+zzSztz3Pg7CqBYD7LFSzvXGn96 DHVLAEQcz046+73z2n0CQphVDiytdRJLlUu+xVk= X-Received: by 2002:a6b:fa12:: with SMTP id p18mr14453335ioh.272.1571115230075; Mon, 14 Oct 2019 21:53:50 -0700 (PDT) MIME-Version: 1.0 References: <20191014071531.12790-1-hslester96@gmail.com> In-Reply-To: From: Steve French Date: Mon, 14 Oct 2019 23:53:38 -0500 Message-ID: Subject: Re: [PATCH] cifs: Fix missed free operations To: Pavel Shilovsky Cc: Chuhong Yuan , Steve French , linux-cifs , samba-technical , Kernel Mailing List Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Merged into cifs-2.6.git for-next and cc: stable for 5.3 On Mon, Oct 14, 2019 at 4:43 PM Pavel Shilovsky via samba-technical wrote: > > =D0=BF=D0=BD, 14 =D0=BE=D0=BA=D1=82. 2019 =D0=B3. =D0=B2 00:18, Chuhong Y= uan : > > > > cifs_setattr_nounix has two paths which miss free operations > > for xid and fullpath. > > Use goto cifs_setattr_exit like other paths to fix them. > > > > Fixes: aa081859b10c ("cifs: flush before set-info if we have writeable = handles") > > Signed-off-by: Chuhong Yuan > > --- > > fs/cifs/inode.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c > > index 5dcc95b38310..df9377828e2f 100644 > > --- a/fs/cifs/inode.c > > +++ b/fs/cifs/inode.c > > @@ -2475,9 +2475,9 @@ cifs_setattr_nounix(struct dentry *direntry, stru= ct iattr *attrs) > > rc =3D tcon->ses->server->ops->flush(xid, tcon,= &wfile->fid); > > cifsFileInfo_put(wfile); > > if (rc) > > - return rc; > > + goto cifs_setattr_exit; > > } else if (rc !=3D -EBADF) > > - return rc; > > + goto cifs_setattr_exit; > > else > > rc =3D 0; > > } > > -- > > 2.20.1 > > > > Looks good, thanks. > > Reviewed-by: Pavel Shilovsky > > The original patch was tagged for stable, so, it seems that this one > should be tagged too. > > -- > Best regards, > Pavel Shilovsky > --=20 Thanks, Steve