From: Kees Cook <keescook@chromium.org>
To: "Guilherme G. Piccoli" <gpiccoli@igalia.com>
Cc: Kees Cook <keescook@chromium.org>,
Tony Luck <tony.luck@intel.com>,
linux-hardening@vger.kernel.org,
Christian Brauner <brauner@kernel.org>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
Al Viro <viro@zeniv.linux.org.uk>,
linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org
Subject: [PATCH 4/5] pstore: inode: Use __free(iput) for inode allocations
Date: Sat, 2 Dec 2023 13:22:14 -0800 [thread overview]
Message-ID: <20231202212217.243710-4-keescook@chromium.org> (raw)
In-Reply-To: <20231202211535.work.571-kees@kernel.org>
Simplify error path for failures where "inode" needs to be freed.
Cc: "Guilherme G. Piccoli" <gpiccoli@igalia.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: linux-hardening@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
---
fs/pstore/inode.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/fs/pstore/inode.c b/fs/pstore/inode.c
index 0d89e0014b6f..20a88e34ea7c 100644
--- a/fs/pstore/inode.c
+++ b/fs/pstore/inode.c
@@ -337,7 +337,7 @@ int pstore_put_backend_records(struct pstore_info *psi)
int pstore_mkfile(struct dentry *root, struct pstore_record *record)
{
struct dentry *dentry;
- struct inode *inode;
+ struct inode *inode __free(iput) = NULL;
int rc = 0;
char name[PSTORE_NAMELEN];
struct pstore_private *private, *pos;
@@ -369,7 +369,7 @@ int pstore_mkfile(struct dentry *root, struct pstore_record *record)
private = kzalloc(sizeof(*private), GFP_KERNEL);
if (!private)
- goto fail_inode;
+ return -ENOMEM;
dentry = d_alloc_name(root, name);
if (!dentry)
@@ -384,7 +384,7 @@ int pstore_mkfile(struct dentry *root, struct pstore_record *record)
inode_set_mtime_to_ts(inode,
inode_set_ctime_to_ts(inode, record->time));
- d_add(dentry, inode);
+ d_add(dentry, no_free_ptr(inode));
list_add(&private->list, &records_list);
@@ -392,8 +392,6 @@ int pstore_mkfile(struct dentry *root, struct pstore_record *record)
fail_private:
free_pstore_private(private);
-fail_inode:
- iput(inode);
return rc;
}
--
2.34.1
next prev parent reply other threads:[~2023-12-02 21:22 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-02 21:22 [PATCH 0/5] pstore: Initial use of cleanup.h Kees Cook
2023-12-02 21:22 ` [PATCH 1/5] pstore: inode: Convert kfree() usage to __free(kfree) Kees Cook
2023-12-02 21:22 ` [PATCH 2/5] pstore: inode: Convert mutex usage to guard(mutex) Kees Cook
2023-12-05 7:01 ` Dave Chinner
2023-12-02 21:22 ` [PATCH 3/5] fs: Add DEFINE_FREE for struct inode Kees Cook
2023-12-02 21:28 ` Al Viro
2023-12-02 21:34 ` Kees Cook
2023-12-02 21:42 ` Al Viro
2023-12-02 21:45 ` Al Viro
2023-12-05 11:38 ` Christian Brauner
2023-12-02 21:22 ` Kees Cook [this message]
2023-12-02 21:22 ` [PATCH 5/5] pstore: inode: Use cleanup.h for struct pstore_private Kees Cook
2023-12-02 22:27 ` Al Viro
2023-12-05 0:54 ` Kees Cook
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231202212217.243710-4-keescook@chromium.org \
--to=keescook@chromium.org \
--cc=brauner@kernel.org \
--cc=gpiccoli@igalia.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=tony.luck@intel.com \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®