d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

devctl: don't publish the mount options

Browse Source 
Mount options aren't solely ASCII strings. In addition, experience to
date suggests that the mount options are much less useful than was
originally supposed and the mount flags suffice to make decisions. Drop
the reporting of options for the mount/remount/unmount events.

Reviewed by:		markj
Reported by:		KASAN
Sponsored by:		Netflix
Differential Revision:	https://reviews.freebsd.org/D31287
This commit is contained in:
Warner Losh 2021-07-24 09:03:53 -06:00
parent 72f7ddb587
commit 6475667f7b
1 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
sys/kern/vfs_mount.c
View File

@ -2553,27 +2553,6 @@ static struct mntoptnames optnames[] = {
MNTOPT_NAMES
};
static void
mount_devctl_event_mntopt(struct sbuf *sb, const char *what, struct vfsoptlist *opts)
{
struct vfsopt *opt;
if (opts == NULL || TAILQ_EMPTY(opts))
return;
sbuf_printf(sb, " %s=\"", what);
TAILQ_FOREACH(opt, opts, link) {
if (opt->name[0] == '\0' || (opt->len > 0 && *(char *)opt->value == '\0'))
continue;
devctl_safe_quote_sb(sb, opt->name);
if (opt->len > 0) {
sbuf_putc(sb, '=');
devctl_safe_quote_sb(sb, opt->value);
}
sbuf_putc(sb, ';');
}
sbuf_putc(sb, '"');
}
#define DEVCTL_LEN 1024
static void
mount_devctl_event(const char *type, struct mount *mp, bool donew)
@ -2606,11 +2585,15 @@ mount_devctl_event(const char *type, struct mount *mp, bool donew)
}
}
sbuf_putc(&sb, '"');
mount_devctl_event_mntopt(&sb, "opt", mp->mnt_opt);
if (donew)
mount_devctl_event_mntopt(&sb, "optnew", mp->mnt_optnew);
sbuf_finish(&sb);
/*
* Options are not published because the form of the options depends on
* the file system and may include binary data. In addition, they don't
* necessarily provide enough useful information to be actionable when
* devd processes them.
*/
if (sbuf_error(&sb) == 0)
devctl_notify("VFS", "FS", type, sbuf_data(&sb));
sbuf_delete(&sb);