From nobody Wed Feb 11 16:26:42 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 85239C77B7F for ; Sat, 6 May 2023 08:21:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231588AbjEFIVu (ORCPT ); Sat, 6 May 2023 04:21:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60622 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231146AbjEFIVq (ORCPT ); Sat, 6 May 2023 04:21:46 -0400 Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B7B1511D90; Sat, 6 May 2023 01:21:27 -0700 (PDT) Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-1aaea43def7so17809455ad.2; Sat, 06 May 2023 01:21:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683361287; x=1685953287; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=4CXvuhOByJMsfFhYlhQ2OXyomMugIHCYBIe2PLk5tMs=; b=SM4bGX5lCbTUoZktmW85hWpA4ReJAkgUmjbIE+ovEoGsZbiG2pxF21XMlkC08+2yXF Vj2Bq0LUtNZVgjIBvgvhvmYYr/DKIcBNlLEeO9HEsBlFqvDFNqsg0HaagStAJv5CFc4p hkXr73Ne/DQ4PJbVFcZ6BmKcDF4EgdADI9HUxnoHVumkLTMpDeSd3Tq9cEpOH1IvTnJI Ztc6uqsxE98+wiFLUD1CVApvZhK1JfDhkSHdt+RzaMcqxpTrDvQUJB6sOGJrW8kLerXw RgFnTTnx8m93jaqWZ8wdl91ypkjv+fcwe4C8GsPw9aeUlshHbXMwaRFt8NkpbnjK7ocs LKcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683361287; x=1685953287; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=4CXvuhOByJMsfFhYlhQ2OXyomMugIHCYBIe2PLk5tMs=; b=mCAWDAb2Uwx43PKa5242I7AOb5SnJ3zGbUqav9iUJ0V3HUHVxwrBpXa/x1+qGNr8ai ewOycRPMwSj2RxpA9tF6UJXpKgq8XYtj2N87zQ8F0mdA3tqRZ4Te5lhgRvS+VEBrY9b1 L6GElieYN+3LadKxQKu47gCHSSk4dNcpk++Z2ltkw5BjjYCDx7Vq31QS3vsXqa83mYUm 8qu05dh64IMoh+V5Vos0Z92aFifr0RMmWfI6EWzDdUUZ5WpNtZ1CuIOMkgfmIvuw5RNA 4LfLkw53j2G9JIxr4+d3yShm1/bQoDewu1NgH9PYHuIE4gipNJ2xPeXDrrCLbYndtvat RqiA== X-Gm-Message-State: AC+VfDwYFhRL/RC4nvbFoYwHxSFu/Dk68DFAtEB56Gr6wZIEHEkwFf2f SfVnvgjL9QHo3AAPwThbsuU= X-Google-Smtp-Source: ACHHUZ6qo/9geOCJRQpEwA4pRAIlqHFTB69okLuLoInBWVhnwLVG2BHR14546QicA2EfOoJxRzn45A== X-Received: by 2002:a17:902:ceca:b0:1a6:5fa2:3293 with SMTP id d10-20020a170902ceca00b001a65fa23293mr4208194plg.56.1683361286633; Sat, 06 May 2023 01:21:26 -0700 (PDT) Received: from localhost.localdomain ([47.98.195.232]) by smtp.gmail.com with ESMTPSA id ie14-20020a17090b400e00b0024e1172c1d3sm9372501pjb.32.2023.05.06.01.21.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 May 2023 01:21:26 -0700 (PDT) From: wenjun93 X-Google-Original-From: wenjun93 To: miklos@szeredi.hu Cc: linux-unionfs@vger.kernel.org, linux-kernel@vger.kernel.org, gwj1235@yeah.net Subject: [PATCH] overlayfs: clean error handling Date: Sat, 6 May 2023 16:21:11 +0800 Message-Id: <20230506082111.1655980-1-gwj1235@yeah.net> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Remove PTR_ERR from unused code path and assign error value where it exactly happens. Signed-off-by: wenjun93 --- fs/overlayfs/copy_up.c | 8 ++++---- fs/overlayfs/dir.c | 46 ++++++++++++++++++++---------------------- fs/overlayfs/export.c | 10 ++++----- fs/overlayfs/namei.c | 16 +++++++-------- fs/overlayfs/readdir.c | 2 +- fs/overlayfs/super.c | 41 ++++++++++++++++++------------------- fs/overlayfs/util.c | 2 +- 7 files changed, 61 insertions(+), 64 deletions(-) diff --git a/fs/overlayfs/copy_up.c b/fs/overlayfs/copy_up.c index f658cc8ea492..1e243b7082df 100644 --- a/fs/overlayfs/copy_up.c +++ b/fs/overlayfs/copy_up.c @@ -507,8 +507,8 @@ static int ovl_create_index(struct dentry *dentry, stru= ct dentry *origin, return err; =20 temp =3D ovl_create_temp(ofs, indexdir, OVL_CATTR(S_IFDIR | 0)); - err =3D PTR_ERR(temp); if (IS_ERR(temp)) + err =3D PTR_ERR(temp); goto free_name; =20 err =3D ovl_set_upper_fh(ofs, upper, temp); @@ -705,8 +705,8 @@ static int ovl_copy_up_workdir(struct ovl_copy_up_ctx *= c) }; =20 /* workdir and destdir could be the same when copying up to indexdir */ - err =3D -EIO; if (lock_rename(c->workdir, c->destdir) !=3D NULL) + err =3D -EIO; goto unlock; =20 err =3D ovl_prep_cu_creds(c->dentry, &cc); @@ -716,8 +716,8 @@ static int ovl_copy_up_workdir(struct ovl_copy_up_ctx *= c) temp =3D ovl_create_temp(ofs, c->workdir, &cattr); ovl_revert_cu_creds(&cc); =20 - err =3D PTR_ERR(temp); if (IS_ERR(temp)) + err =3D PTR_ERR(temp); goto unlock; =20 /* @@ -741,8 +741,8 @@ static int ovl_copy_up_workdir(struct ovl_copy_up_ctx *= c) =20 upper =3D ovl_lookup_upper(ofs, c->destname.name, c->destdir, c->destname.len); - err =3D PTR_ERR(upper); if (IS_ERR(upper)) + err =3D PTR_ERR(upper); goto cleanup; =20 err =3D ovl_do_rename(ofs, wdir, temp, udir, upper, 0); diff --git a/fs/overlayfs/dir.c b/fs/overlayfs/dir.c index fc25fb95d5fc..6c5fedc9ec89 100644 --- a/fs/overlayfs/dir.c +++ b/fs/overlayfs/dir.c @@ -115,8 +115,8 @@ int ovl_cleanup_and_whiteout(struct ovl_fs *ofs, struct= inode *dir, int flags =3D 0; =20 whiteout =3D ovl_whiteout(ofs); - err =3D PTR_ERR(whiteout); if (IS_ERR(whiteout)) + err =3D PTR_ERR(whiteout); return err; =20 if (d_is_dir(dentry)) @@ -176,8 +176,8 @@ struct dentry *ovl_create_real(struct ovl_fs *ofs, stru= ct inode *dir, if (IS_ERR(newdentry)) return newdentry; =20 - err =3D -ESTALE; if (newdentry->d_inode) + err =3D -ESTALE; goto out; =20 if (attr->hardlink) { @@ -336,8 +336,8 @@ static int ovl_create_upper(struct dentry *dentry, stru= ct inode *inode, ovl_lookup_upper(ofs, dentry->d_name.name, upperdir, dentry->d_name.len), attr); - err =3D PTR_ERR(newdentry); if (IS_ERR(newdentry)) + err =3D PTR_ERR(newdentry); goto out_unlock; =20 if (ovl_type_merge(dentry->d_parent) && d_is_dir(newdentry) && @@ -394,8 +394,8 @@ static struct dentry *ovl_clear_empty(struct dentry *de= ntry, goto out_unlock; =20 opaquedir =3D ovl_create_temp(ofs, workdir, OVL_CATTR(stat.mode)); - err =3D PTR_ERR(opaquedir); if (IS_ERR(opaquedir)) + err =3D PTR_ERR(opaquedir); goto out_unlock; =20 err =3D ovl_copy_xattr(dentry->d_sb, &upperpath, opaquedir); @@ -473,17 +473,17 @@ static int ovl_create_over_whiteout(struct dentry *de= ntry, struct inode *inode, =20 upper =3D ovl_lookup_upper(ofs, dentry->d_name.name, upperdir, dentry->d_name.len); - err =3D PTR_ERR(upper); if (IS_ERR(upper)) + err =3D PTR_ERR(upper); goto out_unlock; =20 - err =3D -ESTALE; if (d_is_negative(upper) || !IS_WHITEOUT(d_inode(upper))) + err =3D -ESTALE; goto out_dput; =20 newdentry =3D ovl_create_temp(ofs, workdir, cattr); - err =3D PTR_ERR(newdentry); if (IS_ERR(newdentry)) + err =3D PTR_ERR(newdentry); goto out_dput; =20 /* @@ -577,9 +577,9 @@ static int ovl_create_or_link(struct dentry *dentry, st= ruct inode *inode, } =20 if (!attr->hardlink) { - err =3D -ENOMEM; override_cred =3D prepare_creds(); if (!override_cred) + err =3D -ENOMEM; goto out_revert_creds; /* * In the creation cases(create, mkdir, mknod, symlink), @@ -632,9 +632,9 @@ static int ovl_create_object(struct dentry *dentry, int= mode, dev_t rdev, goto out; =20 /* Preallocate inode to be used by ovl_get_inode() */ - err =3D -ENOMEM; inode =3D ovl_new_inode(dentry->d_sb, mode, rdev); if (!inode) + err =3D -ENOMEM; goto out_drop_write; =20 spin_lock(&inode->i_lock); @@ -759,8 +759,8 @@ static int ovl_remove_and_whiteout(struct dentry *dentr= y, =20 if (!list_empty(list)) { opaquedir =3D ovl_clear_empty(dentry, list); - err =3D PTR_ERR(opaquedir); if (IS_ERR(opaquedir)) + err =3D PTR_ERR(opaquedir); goto out; } =20 @@ -770,14 +770,14 @@ static int ovl_remove_and_whiteout(struct dentry *den= try, =20 upper =3D ovl_lookup_upper(ofs, dentry->d_name.name, upperdir, dentry->d_name.len); - err =3D PTR_ERR(upper); if (IS_ERR(upper)) + err =3D PTR_ERR(upper); goto out_unlock; =20 - err =3D -ESTALE; if ((opaquedir && upper !=3D opaquedir) || (!opaquedir && ovl_dentry_upper(dentry) && !ovl_matches_upper(dentry, upper))) { + err =3D -ESTALE; goto out_dput_upper; } =20 @@ -810,21 +810,21 @@ static int ovl_remove_upper(struct dentry *dentry, bo= ol is_dir, =20 if (!list_empty(list)) { opaquedir =3D ovl_clear_empty(dentry, list); - err =3D PTR_ERR(opaquedir); if (IS_ERR(opaquedir)) + err =3D PTR_ERR(opaquedir); goto out; } =20 inode_lock_nested(dir, I_MUTEX_PARENT); upper =3D ovl_lookup_upper(ofs, dentry->d_name.name, upperdir, dentry->d_name.len); - err =3D PTR_ERR(upper); if (IS_ERR(upper)) + err =3D PTR_ERR(upper); goto out_unlock; =20 - err =3D -ESTALE; if ((opaquedir && upper !=3D opaquedir) || (!opaquedir && !ovl_matches_upper(dentry, upper))) + err =3D -ESTALE; goto out_dput_upper; =20 if (is_dir) @@ -1098,17 +1098,15 @@ static int ovl_rename(struct mnt_idmap *idmap, stru= ct inode *olddir, struct ovl_fs *ofs =3D OVL_FS(old->d_sb); LIST_HEAD(list); =20 - err =3D -EINVAL; if (flags & ~(RENAME_EXCHANGE | RENAME_NOREPLACE)) + err =3D -EINVAL; goto out; =20 flags &=3D ~RENAME_NOREPLACE; =20 /* Don't copy up directory trees */ - err =3D -EXDEV; - if (!ovl_can_move(old)) - goto out; - if (!overwrite && !ovl_can_move(new)) + if (!ovl_can_move(old) || (!overwrite && !ovl_can_move(new))) + err =3D -EXDEV; goto out; =20 if (overwrite && new_is_dir && !ovl_pure_upper(new)) { @@ -1159,8 +1157,8 @@ static int ovl_rename(struct mnt_idmap *idmap, struct= inode *olddir, =20 if (!list_empty(&list)) { opaquedir =3D ovl_clear_empty(new, &list); - err =3D PTR_ERR(opaquedir); if (IS_ERR(opaquedir)) { + err =3D PTR_ERR(opaquedir); opaquedir =3D NULL; goto out_revert_creds; } @@ -1192,18 +1190,18 @@ static int ovl_rename(struct mnt_idmap *idmap, stru= ct inode *olddir, =20 olddentry =3D ovl_lookup_upper(ofs, old->d_name.name, old_upperdir, old->d_name.len); - err =3D PTR_ERR(olddentry); if (IS_ERR(olddentry)) + err =3D PTR_ERR(olddentry); goto out_unlock; =20 - err =3D -ESTALE; if (!ovl_matches_upper(old, olddentry)) + err =3D -ESTALE; goto out_dput_old; =20 newdentry =3D ovl_lookup_upper(ofs, new->d_name.name, new_upperdir, new->d_name.len); - err =3D PTR_ERR(newdentry); if (IS_ERR(newdentry)) + err =3D PTR_ERR(newdentry); goto out_dput_old; =20 old_opaque =3D ovl_dentry_is_opaque(old); diff --git a/fs/overlayfs/export.c b/fs/overlayfs/export.c index defd4e231ad2..a9a4c0e4a772 100644 --- a/fs/overlayfs/export.c +++ b/fs/overlayfs/export.c @@ -379,9 +379,9 @@ static struct dentry *ovl_lookup_real_one(struct dentry= *connected, * connected real path from the top. */ inode_lock_nested(dir, I_MUTEX_PARENT); - err =3D -ECHILD; parent =3D dget_parent(real); if (ovl_dentry_real_at(connected, layer->idx) !=3D parent) + err =3D -ECHILD; goto fail; =20 /* @@ -716,8 +716,8 @@ static struct dentry *ovl_lower_fh_to_d(struct super_bl= ock *sb, if (!d_is_dir(origin.dentry) || !(origin.dentry->d_flags & DCACHE_DISCONNECTED)) { inode =3D ovl_lookup_inode(sb, origin.dentry, false); - err =3D PTR_ERR(inode); if (IS_ERR(inode)) + err =3D PTR_ERR(inode); goto out_err; if (inode) { dentry =3D d_find_any_alias(inode); @@ -730,8 +730,8 @@ static struct dentry *ovl_lower_fh_to_d(struct super_bl= ock *sb, /* Then lookup indexed upper/whiteout by origin fh */ if (ofs->indexdir) { index =3D ovl_get_index_fh(ofs, fh); - err =3D PTR_ERR(index); if (IS_ERR(index)) { + err =3D PTR_ERR(index); index =3D NULL; goto out_err; } @@ -741,8 +741,8 @@ static struct dentry *ovl_lower_fh_to_d(struct super_bl= ock *sb, if (index && d_is_dir(index)) { struct dentry *upper =3D ovl_index_upper(ofs, index, true); =20 - err =3D PTR_ERR(upper); if (IS_ERR_OR_NULL(upper)) + err =3D PTR_ERR(upper); goto out_err; =20 dentry =3D ovl_get_dentry(sb, upper, NULL, NULL); @@ -810,8 +810,8 @@ static struct dentry *ovl_fh_to_dentry(struct super_blo= ck *sb, struct fid *fid, int err; =20 fh =3D ovl_fid_to_fh(fid, len, fh_type); - err =3D PTR_ERR(fh); if (IS_ERR(fh)) + err =3D PTR_ERR(fh); goto out_err; =20 err =3D ovl_check_fh_len(fh, len); diff --git a/fs/overlayfs/namei.c b/fs/overlayfs/namei.c index cfb3420b7df0..c74625a4bec5 100644 --- a/fs/overlayfs/namei.c +++ b/fs/overlayfs/namei.c @@ -462,8 +462,8 @@ int ovl_verify_set_fh(struct ovl_fs *ofs, struct dentry= *dentry, int err; =20 fh =3D ovl_encode_real_fh(ofs, real, is_upper); - err =3D PTR_ERR(fh); if (IS_ERR(fh)) { + err =3D PTR_ERR(fh); fh =3D NULL; goto fail; } @@ -533,18 +533,18 @@ int ovl_verify_index(struct ovl_fs *ofs, struct dentr= y *index) if (!d_inode(index)) return 0; =20 - err =3D -EINVAL; if (index->d_name.len < sizeof(struct ovl_fb)*2) + err =3D -EINVAL; goto fail; =20 - err =3D -ENOMEM; len =3D index->d_name.len / 2; fh =3D kzalloc(len + OVL_FH_WIRE_OFFSET, GFP_KERNEL); if (!fh) + err =3D -ENOMEM; goto fail; =20 - err =3D -EINVAL; if (hex2bin(fh->buf, index->d_name.name, len)) + err =3D -EINVAL; goto fail; =20 err =3D ovl_check_fb_len(&fh->fb, len); @@ -905,10 +905,10 @@ struct dentry *ovl_lookup(struct inode *dir, struct d= entry *dentry, } =20 if (!d.stop && poe->numlower) { - err =3D -ENOMEM; stack =3D kcalloc(ofs->numlayer - 1, sizeof(struct ovl_path), GFP_KERNEL); if (!stack) + err =3D -ENOMEM; goto out_put_upper; } =20 @@ -994,10 +994,10 @@ struct dentry *ovl_lookup(struct inode *dir, struct d= entry *dentry, * Only following redirects when redirects are enabled disables * this attack vector when not necessary. */ - err =3D -EPERM; if (d.redirect && !ofs->config.redirect_follow) { pr_warn_ratelimited("refusing to follow redirect for (%pd2)\n", dentry); + err =3D -EPERM; goto out_put; } =20 @@ -1068,8 +1068,8 @@ struct dentry *ovl_lookup(struct inode *dir, struct d= entry *dentry, } =20 oe =3D ovl_alloc_entry(ctr); - err =3D -ENOMEM; if (!oe) + err =3D -ENOMEM; goto out_put; =20 memcpy(oe->lowerstack, stack, sizeof(struct ovl_path) * ctr); @@ -1115,8 +1115,8 @@ struct dentry *ovl_lookup(struct inode *dir, struct d= entry *dentry, }; =20 inode =3D ovl_get_inode(dentry->d_sb, &oip); - err =3D PTR_ERR(inode); if (IS_ERR(inode)) + err =3D PTR_ERR(inode); goto out_free_oe; if (upperdentry && !uppermetacopy) ovl_set_flag(OVL_UPPERDATA, inode); diff --git a/fs/overlayfs/readdir.c b/fs/overlayfs/readdir.c index b6952b21a7ee..5da31635a597 100644 --- a/fs/overlayfs/readdir.c +++ b/fs/overlayfs/readdir.c @@ -764,8 +764,8 @@ static int ovl_iterate(struct file *file, struct dir_co= ntext *ctx) struct ovl_dir_cache *cache; =20 cache =3D ovl_cache_get(dentry); - err =3D PTR_ERR(cache); if (IS_ERR(cache)) + err =3D PTR_ERR(cache); goto out; =20 od->cache =3D cache; diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c index f97ad8b40dbb..268d2ca232a0 100644 --- a/fs/overlayfs/super.c +++ b/fs/overlayfs/super.c @@ -801,8 +801,8 @@ static struct dentry *ovl_workdir_create(struct ovl_fs = *ofs, goto out_dput; =20 /* Weird filesystem returning with hashed negative (kernfs)? */ - err =3D -EINVAL; if (d_really_is_negative(work)) + err =3D -EINVAL; goto out_dput; =20 /* @@ -1130,8 +1130,8 @@ static int ovl_get_upper(struct super_block *sb, stru= ct ovl_fs *ofs, goto out; =20 upper_mnt =3D clone_private_mount(upperpath); - err =3D PTR_ERR(upper_mnt); if (IS_ERR(upper_mnt)) { + err =3D PTR_ERR(upper_mnt); pr_err("failed to clone upperpath\n"); goto out; } @@ -1184,13 +1184,13 @@ static int ovl_check_rename_whiteout(struct ovl_fs = *ofs) inode_lock_nested(dir, I_MUTEX_PARENT); =20 temp =3D ovl_create_temp(ofs, workdir, OVL_CATTR(S_IFREG | 0)); - err =3D PTR_ERR(temp); if (IS_ERR(temp)) + err =3D PTR_ERR(temp); goto out_unlock; =20 dest =3D ovl_lookup_temp(ofs, workdir); - err =3D PTR_ERR(dest); if (IS_ERR(dest)) { + err =3D PTR_ERR(dest); dput(temp); goto out_unlock; } @@ -1205,8 +1205,8 @@ static int ovl_check_rename_whiteout(struct ovl_fs *o= fs) } =20 whiteout =3D ovl_lookup_upper(ofs, name.name.name, workdir, name.name.len= ); - err =3D PTR_ERR(whiteout); if (IS_ERR(whiteout)) + err =3D PTR_ERR(whiteout); goto cleanup_temp; =20 err =3D ovl_is_whiteout(whiteout); @@ -1284,8 +1284,8 @@ static int ovl_make_workdir(struct super_block *sb, s= truct ovl_fs *ofs, return err; =20 workdir =3D ovl_workdir_create(ofs, OVL_WORKDIR_NAME, false); - err =3D PTR_ERR(workdir); if (IS_ERR_OR_NULL(workdir)) + err =3D PTR_ERR(workdir); goto out; =20 ofs->workdir =3D workdir; @@ -1598,9 +1598,9 @@ static int ovl_get_layers(struct super_block *sb, str= uct ovl_fs *ofs, int err; unsigned int i; =20 - err =3D -ENOMEM; ofs->fs =3D kcalloc(numlower + 1, sizeof(struct ovl_sb), GFP_KERNEL); if (ofs->fs =3D=3D NULL) + err =3D -ENOMEM; goto out; =20 /* idx/fsid 0 are reserved for upper fs even with lower only overlay */ @@ -1652,8 +1652,8 @@ static int ovl_get_layers(struct super_block *sb, str= uct ovl_fs *ofs, } =20 mnt =3D clone_private_mount(&stack[i]); - err =3D PTR_ERR(mnt); if (IS_ERR(mnt)) { + err =3D PTR_ERR(mnt); pr_err("failed to clone lowerpath\n"); iput(trap); goto out; @@ -1729,7 +1729,6 @@ static struct ovl_entry *ovl_get_lowerstack(struct su= per_block *sb, if (!stack) return ERR_PTR(-ENOMEM); =20 - err =3D -EINVAL; for (i =3D 0; i < numlower; i++) { err =3D ovl_lower_dir(lower, &stack[i], ofs, &sb->s_stack_depth); if (err) @@ -1738,10 +1737,10 @@ static struct ovl_entry *ovl_get_lowerstack(struct = super_block *sb, lower =3D strchr(lower, '\0') + 1; } =20 - err =3D -EINVAL; sb->s_stack_depth++; if (sb->s_stack_depth > FILESYSTEM_MAX_STACK_DEPTH) { pr_err("maximum fs stacking depth exceeded\n"); + err =3D -EINVAL; goto out_err; } =20 @@ -1749,9 +1748,9 @@ static struct ovl_entry *ovl_get_lowerstack(struct su= per_block *sb, if (err) goto out_err; =20 - err =3D -ENOMEM; oe =3D ovl_alloc_entry(numlower); if (!oe) + err =3D -ENOMEM; goto out_err; =20 for (i =3D 0; i < numlower; i++) { @@ -1894,20 +1893,20 @@ static int ovl_fill_super(struct super_block *sb, v= oid *data, int silent) unsigned int numlower; int err; =20 - err =3D -EIO; if (WARN_ON(sb->s_user_ns !=3D current_user_ns())) + err =3D -EIO; goto out; =20 sb->s_d_op =3D &ovl_dentry_operations; =20 - err =3D -ENOMEM; ofs =3D kzalloc(sizeof(struct ovl_fs), GFP_KERNEL); if (!ofs) + err =3D -ENOMEM; goto out; =20 - err =3D -ENOMEM; ofs->creator_cred =3D cred =3D prepare_creds(); if (!cred) + err =3D -ENOMEM; goto out_err; =20 /* Is there a reason anyone would want not to share whiteouts? */ @@ -1922,29 +1921,29 @@ static int ovl_fill_super(struct super_block *sb, v= oid *data, int silent) if (err) goto out_err; =20 - err =3D -EINVAL; if (!ofs->config.lowerdir) { if (!silent) pr_err("missing 'lowerdir'\n"); + err =3D -EINVAL; goto out_err; } =20 - err =3D -ENOMEM; splitlower =3D kstrdup(ofs->config.lowerdir, GFP_KERNEL); if (!splitlower) + err =3D -ENOMEM; goto out_err; =20 - err =3D -EINVAL; numlower =3D ovl_split_lowerdirs(splitlower); if (numlower > OVL_MAX_STACK) { pr_err("too many lower directories, limit is %d\n", OVL_MAX_STACK); + err =3D -EINVAL; goto out_err; } =20 - err =3D -ENOMEM; layers =3D kcalloc(numlower + 1, sizeof(struct ovl_layer), GFP_KERNEL); if (!layers) + err =3D -ENOMEM; goto out_err; =20 ofs->layers =3D layers; @@ -1969,9 +1968,9 @@ static int ovl_fill_super(struct super_block *sb, voi= d *data, int silent) if (ofs->config.upperdir) { struct super_block *upper_sb; =20 - err =3D -EINVAL; if (!ofs->config.workdir) { pr_err("missing 'workdir'\n"); + err =3D -EINVAL; goto out_err; } =20 @@ -2000,8 +1999,8 @@ static int ovl_fill_super(struct super_block *sb, voi= d *data, int silent) sb->s_time_gran =3D upper_sb->s_time_gran; } oe =3D ovl_get_lowerstack(sb, splitlower, numlower, ofs, layers); - err =3D PTR_ERR(oe); if (IS_ERR(oe)) + err =3D PTR_ERR(oe); goto out_err; =20 /* If the upper fs is nonexistent, we mark overlayfs r/o too */ @@ -2054,9 +2053,9 @@ static int ovl_fill_super(struct super_block *sb, voi= d *data, int silent) sb->s_flags |=3D SB_POSIXACL; sb->s_iflags |=3D SB_I_SKIP_SYNC; =20 - err =3D -ENOMEM; root_dentry =3D ovl_get_root(sb, upperpath.dentry, oe); if (!root_dentry) + err =3D -ENOMEM; goto out_free_oe; =20 mntput(upperpath.mnt); diff --git a/fs/overlayfs/util.c b/fs/overlayfs/util.c index 923d66d131c1..4b9f09a274ae 100644 --- a/fs/overlayfs/util.c +++ b/fs/overlayfs/util.c @@ -851,8 +851,8 @@ static void ovl_cleanup_index(struct dentry *dentry) =20 inode_lock_nested(dir, I_MUTEX_PARENT); index =3D ovl_lookup_upper(ofs, name.name, indexdir, name.len); - err =3D PTR_ERR(index); if (IS_ERR(index)) { + err =3D PTR_ERR(index); index =3D NULL; } else if (ovl_index_all(dentry->d_sb)) { /* Whiteout orphan index to block future open by handle */ --=20 2.27.0