From: Gabriel Krisman Bertazi <krisman@collabora.com>
To: ltp@lists.linux.it, jack@suse.com, amir73il@gmail.com
Cc: linux-ext4@vger.kernel.org, kernel@collabora.com,
Gabriel Krisman Bertazi <krisman@collabora.com>,
khazhy@google.com, repnop@google.com
Subject: [LTP] [PATCH v2 05/10] syscalls/fanotify20: Validate incoming FID in FAN_FS_ERROR
Date: Tue, 26 Oct 2021 15:42:34 -0300 [thread overview]
Message-ID: <20211026184239.151156-6-krisman@collabora.com> (raw)
In-Reply-To: <20211026184239.151156-1-krisman@collabora.com>
Verify the FID provided in the event. If the FH has size 0, this is
assumed to be a superblock error (i.e. null FH).
Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com>
---
Changes since v1:
- Move defines to header file.
- Use 0-len FH for sb error
---
testcases/kernel/syscalls/fanotify/fanotify.h | 4 ++
.../kernel/syscalls/fanotify/fanotify20.c | 63 +++++++++++++++++++
2 files changed, 67 insertions(+)
diff --git a/testcases/kernel/syscalls/fanotify/fanotify.h b/testcases/kernel/syscalls/fanotify/fanotify.h
index 58e30aaf00bc..9bff3cf1a3fe 100644
--- a/testcases/kernel/syscalls/fanotify/fanotify.h
+++ b/testcases/kernel/syscalls/fanotify/fanotify.h
@@ -435,4 +435,8 @@ struct fanotify_event_info_header *get_event_info(
((struct fanotify_event_info_error *) \
get_event_info((event), FAN_EVENT_INFO_TYPE_ERROR))
+#define get_event_info_fid(event) \
+ ((struct fanotify_event_info_fid *) \
+ get_event_info((event), FAN_EVENT_INFO_TYPE_FID))
+
#endif /* __FANOTIFY_H__ */
diff --git a/testcases/kernel/syscalls/fanotify/fanotify20.c b/testcases/kernel/syscalls/fanotify/fanotify20.c
index 6074d449ae63..220cd51419e8 100644
--- a/testcases/kernel/syscalls/fanotify/fanotify20.c
+++ b/testcases/kernel/syscalls/fanotify/fanotify20.c
@@ -34,20 +34,61 @@
#ifdef HAVE_SYS_FANOTIFY_H
#include "fanotify.h"
+#ifndef FILEID_INVALID
+#define FILEID_INVALID 0xff
+#endif
+
#define BUF_SIZE 256
static char event_buf[BUF_SIZE];
int fd_notify;
#define MOUNT_PATH "test_mnt"
+/* These expected FIDs are common to multiple tests */
+static struct fanotify_fid_t null_fid;
+
static struct test_case {
char *name;
int error;
unsigned int error_count;
+ struct fanotify_fid_t *fid;
void (*trigger_error)(void);
} testcases[] = {
};
+int check_error_event_info_fid(struct fanotify_event_info_fid *fid,
+ const struct test_case *ex)
+{
+ struct file_handle *fh = (struct file_handle *) &fid->handle;
+
+ if (memcmp(&fid->fsid, &ex->fid->fsid, sizeof(fid->fsid))) {
+ tst_res(TFAIL, "%s: Received bad FSID type (%x...!=%x...)",
+ ex->name, FSID_VAL_MEMBER(fid->fsid, 0),
+ FSID_VAL_MEMBER(ex->fid->fsid, 0));
+
+ return 1;
+ }
+ if (fh->handle_type != ex->fid->handle.handle_type) {
+ tst_res(TFAIL, "%s: Received bad file_handle type (%d!=%d)",
+ ex->name, fh->handle_type, ex->fid->handle.handle_type);
+ return 1;
+ }
+
+ if (fh->handle_bytes != ex->fid->handle.handle_bytes) {
+ tst_res(TFAIL, "%s: Received bad file_handle len (%d!=%d)",
+ ex->name, fh->handle_bytes, ex->fid->handle.handle_bytes);
+ return 1;
+ }
+
+ if (memcmp(fh->f_handle, ex->fid->handle.f_handle, fh->handle_bytes)) {
+ tst_res(TFAIL, "%s: Received wrong handle. "
+ "Expected (%x...) got (%x...) ", ex->name,
+ *(int*)ex->fid->handle.f_handle, *(int*)fh->f_handle);
+ return 1;
+ }
+ return 0;
+}
+
int check_error_event_info_error(struct fanotify_event_info_error *info_error,
const struct test_case *ex)
{
@@ -91,6 +132,7 @@ void check_event(char *buf, size_t len, const struct test_case *ex)
struct fanotify_event_metadata *event =
(struct fanotify_event_metadata *) buf;
struct fanotify_event_info_error *info_error;
+ struct fanotify_event_info_fid *info_fid;
int fail = 0;
if (len < FAN_EVENT_METADATA_LEN) {
@@ -109,6 +151,14 @@ void check_event(char *buf, size_t len, const struct test_case *ex)
fail++;
}
+ info_fid = get_event_info_fid(event);
+ if (info_fid)
+ fail += check_error_event_info_fid(info_fid, ex);
+ else {
+ tst_res(TFAIL, "FID record not found");
+ fail++;
+ }
+
if (!fail)
tst_res(TPASS, "Successfully received: %s", ex->name);
}
@@ -125,12 +175,25 @@ static void do_test(unsigned int i)
check_event(event_buf, read_len, tcase);
}
+static void init_null_fid(void)
+{
+ /* Use fanotify_save_fid to fill the fsid and overwrite the
+ * file_handler to create a null_fid
+ */
+ fanotify_save_fid(MOUNT_PATH, &null_fid);
+
+ null_fid.handle.handle_type = FILEID_INVALID;
+ null_fid.handle.handle_bytes = 0;
+}
+
static void setup(void)
{
REQUIRE_FANOTIFY_EVENTS_SUPPORTED_ON_FS(FAN_CLASS_NOTIF|FAN_REPORT_FID,
FAN_MARK_FILESYSTEM,
FAN_FS_ERROR, ".");
+ init_null_fid();
+
fd_notify = SAFE_FANOTIFY_INIT(FAN_CLASS_NOTIF|FAN_REPORT_FID,
O_RDONLY);
--
2.33.0
--
Mailing list info: https://lists.linux.it/listinfo/ltp
next prev parent reply other threads:[~2021-10-26 18:44 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-26 18:42 [LTP] [PATCH v2 00/10] Test the new fanotify FAN_FS_ERROR event Gabriel Krisman Bertazi
2021-10-26 18:42 ` [LTP] [PATCH v2 01/10] syscalls: fanotify: Add macro to require specific mark types Gabriel Krisman Bertazi
2021-10-27 6:10 ` Amir Goldstein
2021-10-26 18:42 ` [LTP] [PATCH v2 02/10] syscalls: fanotify: Add macro to require specific events Gabriel Krisman Bertazi
2021-10-27 6:23 ` Amir Goldstein
2021-10-26 18:42 ` [LTP] [PATCH v2 03/10] syscalls/fanotify20: Introduce helpers for FAN_FS_ERROR test Gabriel Krisman Bertazi
2021-10-27 6:33 ` Amir Goldstein
2021-10-26 18:42 ` [LTP] [PATCH v2 04/10] syscalls/fanotify20: Validate the generic error info Gabriel Krisman Bertazi
2021-10-27 6:43 ` Amir Goldstein
2021-10-27 10:19 ` Amir Goldstein
2021-10-26 18:42 ` Gabriel Krisman Bertazi [this message]
2021-10-27 6:48 ` [LTP] [PATCH v2 05/10] syscalls/fanotify20: Validate incoming FID in FAN_FS_ERROR Amir Goldstein
2021-10-26 18:42 ` [LTP] [PATCH v2 06/10] syscalls/fanotify20: Support submission of debugfs commands Gabriel Krisman Bertazi
2021-10-27 6:49 ` Amir Goldstein
2021-10-26 18:42 ` [LTP] [PATCH v2 07/10] syscalls/fanotify20: Create a corrupted file Gabriel Krisman Bertazi
2021-10-27 6:51 ` Amir Goldstein
2021-10-26 18:42 ` [LTP] [PATCH v2 08/10] syscalls/fanotify20: Test event after filesystem abort Gabriel Krisman Bertazi
2021-10-27 9:56 ` Amir Goldstein
2021-10-26 18:42 ` [LTP] [PATCH v2 09/10] syscalls/fanotify20: Test file event with broken inode Gabriel Krisman Bertazi
2021-10-27 9:57 ` Amir Goldstein
2021-10-26 18:42 ` [LTP] [PATCH v2 10/10] syscalls/fanotify20: Test capture of multiple errors Gabriel Krisman Bertazi
2021-10-27 10:00 ` Amir Goldstein
2021-10-29 15:03 ` Gabriel Krisman Bertazi
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=20211026184239.151156-6-krisman@collabora.com \
--to=krisman@collabora.com \
--cc=amir73il@gmail.com \
--cc=jack@suse.com \
--cc=kernel@collabora.com \
--cc=khazhy@google.com \
--cc=linux-ext4@vger.kernel.org \
--cc=ltp@lists.linux.it \
--cc=repnop@google.com \
/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;
as well as URLs for NNTP newsgroup(s).