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=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 C29FAC4363A for ; Tue, 27 Oct 2020 00:20:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8A2CF20723 for ; Tue, 27 Oct 2020 00:20:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603758056; bh=9g0xJO2pHkWsEKDJ6Xyn/25xkcxvR4Y42iqmovWtZps=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=nMB9uSw5rCjdrfBhMqTKnmqtyC/haTxto11w++EsdfZkBuqaixms4PZNmgz+AgaKE WCkfc5VeOp+dCUZ9HGR7pjeXnH7s//fzZMKZYQOBru7pGMiHudd2Yj1HJwuNqbAMN3 BuDOlo/OUxYpmy4OzGGmg2JB+d1pMUt/WarQVez8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2438669AbgJ0AGB (ORCPT ); Mon, 26 Oct 2020 20:06:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:54166 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2438176AbgJ0AFQ (ORCPT ); Mon, 26 Oct 2020 20:05:16 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 20F28218AC; Tue, 27 Oct 2020 00:05:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603757115; bh=9g0xJO2pHkWsEKDJ6Xyn/25xkcxvR4Y42iqmovWtZps=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sVbOY1m9X5f13/+WhBs3NTANQYuMxpgCCR7q7XZ55YE/o/l+my12G1HTdIHEaAU+7 4TRRoKaYkMA1k3WAsZu/VfCeGM+FXBSebNb1k7kHMC14mWut8N/hJ5uvNK+7VP3xX8 WiSl//LakpA/fEFGy4m4od5rxzRSGH6hVhYEEXuE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ronnie Sahlberg , Steve French , Sasha Levin , linux-cifs@vger.kernel.org, samba-technical@lists.samba.org Subject: [PATCH AUTOSEL 4.19 51/60] cifs: handle -EINTR in cifs_setattr Date: Mon, 26 Oct 2020 20:04:06 -0400 Message-Id: <20201027000415.1026364-51-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201027000415.1026364-1-sashal@kernel.org> References: <20201027000415.1026364-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Ronnie Sahlberg [ Upstream commit c6cc4c5a72505a0ecefc9b413f16bec512f38078 ] RHBZ: 1848178 Some calls that set attributes, like utimensat(), are not supposed to return -EINTR and thus do not have handlers for this in glibc which causes us to leak -EINTR to the applications which are also unprepared to handle it. For example tar will break if utimensat() return -EINTR and abort unpacking the archive. Other applications may break too. To handle this we add checks, and retry, for -EINTR in cifs_setattr() Signed-off-by: Ronnie Sahlberg Signed-off-by: Steve French Signed-off-by: Sasha Levin --- fs/cifs/inode.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index 4a38f16d944db..d30eb43506562 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c @@ -2550,13 +2550,18 @@ cifs_setattr(struct dentry *direntry, struct iattr *attrs) { struct cifs_sb_info *cifs_sb = CIFS_SB(direntry->d_sb); struct cifs_tcon *pTcon = cifs_sb_master_tcon(cifs_sb); + int rc, retries = 0; - if (pTcon->unix_ext) - return cifs_setattr_unix(direntry, attrs); - - return cifs_setattr_nounix(direntry, attrs); + do { + if (pTcon->unix_ext) + rc = cifs_setattr_unix(direntry, attrs); + else + rc = cifs_setattr_nounix(direntry, attrs); + retries++; + } while (is_retryable_error(rc) && retries < 2); /* BB: add cifs_setattr_legacy for really old servers */ + return rc; } #if 0 -- 2.25.1