From: Hans de Goede <hdegoede@redhat.com>
To: Arnd Bergmann <arnd@arndb.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Hans de Goede <hdegoede@redhat.com>, linux-kernel@vger.kernel.org
Subject: [PATCH v2 7/8] virt: vbox: Log unknown ioctl requests as error
Date: Tue, 23 Jun 2020 16:24:00 +0200 [thread overview]
Message-ID: <20200623142401.3742-8-hdegoede@redhat.com> (raw)
In-Reply-To: <20200623142401.3742-1-hdegoede@redhat.com>
Every now and then upstream adds new ioctls without notifying us,
log unknown ioctl requests as an error to catch these.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
Changes in v2:
- Rate-limit the error logging to avoid userspace potentially DOS-ing the log
---
drivers/virt/vboxguest/vboxguest_core.c | 2 +-
drivers/virt/vboxguest/vboxguest_utils.c | 1 +
include/linux/vbox_utils.h | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/virt/vboxguest/vboxguest_core.c b/drivers/virt/vboxguest/vboxguest_core.c
index ffd76b949276..c5dfcd42fd07 100644
--- a/drivers/virt/vboxguest/vboxguest_core.c
+++ b/drivers/virt/vboxguest/vboxguest_core.c
@@ -1739,7 +1739,7 @@ int vbg_core_ioctl(struct vbg_session *session, unsigned int req, void *data)
return vbg_ioctl_log(data);
}
- vbg_debug("VGDrvCommonIoCtl: Unknown req %#08x\n", req);
+ vbg_err_ratelimited("Userspace made an unknown ioctl req %#08x\n", req);
return -ENOTTY;
}
diff --git a/drivers/virt/vboxguest/vboxguest_utils.c b/drivers/virt/vboxguest/vboxguest_utils.c
index 7396187ee32a..ea05af41ec69 100644
--- a/drivers/virt/vboxguest/vboxguest_utils.c
+++ b/drivers/virt/vboxguest/vboxguest_utils.c
@@ -59,6 +59,7 @@ EXPORT_SYMBOL(name)
VBG_LOG(vbg_info, pr_info);
VBG_LOG(vbg_warn, pr_warn);
VBG_LOG(vbg_err, pr_err);
+VBG_LOG(vbg_err_ratelimited, pr_err_ratelimited);
#if defined(DEBUG) && !defined(CONFIG_DYNAMIC_DEBUG)
VBG_LOG(vbg_debug, pr_debug);
#endif
diff --git a/include/linux/vbox_utils.h b/include/linux/vbox_utils.h
index ff56c443180c..db8a7d118093 100644
--- a/include/linux/vbox_utils.h
+++ b/include/linux/vbox_utils.h
@@ -16,6 +16,7 @@ struct vbg_dev;
__printf(1, 2) void vbg_info(const char *fmt, ...);
__printf(1, 2) void vbg_warn(const char *fmt, ...);
__printf(1, 2) void vbg_err(const char *fmt, ...);
+__printf(1, 2) void vbg_err_ratelimited(const char *fmt, ...);
/* Only use backdoor logging for non-dynamic debug builds */
#if defined(DEBUG) && !defined(CONFIG_DYNAMIC_DEBUG)
--
2.26.2
next prev parent reply other threads:[~2020-06-23 14:24 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-23 14:23 [PATCH v2 0/8] virt: vbox: Add support for the new VBG_IOCTL_ACQUIRE_GUEST_CAPABILITIES ioctl Hans de Goede
2020-06-23 14:23 ` [PATCH v2 1/8] virt: vbox: Fix VBGL_IOCTL_VMMDEV_REQUEST_BIG and _LOG req numbers to match upstream Hans de Goede
2020-06-23 14:23 ` [PATCH v2 2/8] virt: vbox: Fix guest capabilities mask check Hans de Goede
2020-06-23 14:23 ` [PATCH v2 3/8] virt: vbox: Rename guest_caps struct members to set_guest_caps Hans de Goede
2020-06-23 14:23 ` [PATCH v2 4/8] virt: vbox: Add vbg_set_host_capabilities() helper function Hans de Goede
2020-06-23 14:23 ` [PATCH v2 5/8] virt: vbox: Add support for the new VBG_IOCTL_ACQUIRE_GUEST_CAPABILITIES ioctl Hans de Goede
2020-06-23 14:23 ` [PATCH v2 6/8] virt: vbox: Add a few new vmmdev request types to the userspace whitelist Hans de Goede
2020-06-23 14:24 ` Hans de Goede [this message]
2020-06-23 14:24 ` [PATCH v2 8/8] virt: vbox: Fix some comments which talk about the "session spinlock" Hans de Goede
2020-07-07 15:37 ` [PATCH v2 0/8] virt: vbox: Add support for the new VBG_IOCTL_ACQUIRE_GUEST_CAPABILITIES ioctl Hans de Goede
2020-07-07 20:22 ` Arnd Bergmann
2020-06-23 14:27 [PATCH v2 0/8 resend] " Hans de Goede
2020-06-23 14:27 ` [PATCH v2 1/8] virt: vbox: Fix VBGL_IOCTL_VMMDEV_REQUEST_BIG and _LOG req numbers to match upstream Hans de Goede
2020-06-23 14:27 ` [PATCH v2 2/8] virt: vbox: Fix guest capabilities mask check Hans de Goede
2020-06-23 14:27 ` [PATCH v2 3/8] virt: vbox: Rename guest_caps struct members to set_guest_caps Hans de Goede
2020-06-23 14:27 ` [PATCH v2 4/8] virt: vbox: Add vbg_set_host_capabilities() helper function Hans de Goede
2020-06-23 14:27 ` [PATCH v2 5/8] virt: vbox: Add support for the new VBG_IOCTL_ACQUIRE_GUEST_CAPABILITIES ioctl Hans de Goede
2020-06-23 14:27 ` [PATCH v2 6/8] virt: vbox: Add a few new vmmdev request types to the userspace whitelist Hans de Goede
2020-06-23 14:27 ` [PATCH v2 7/8] virt: vbox: Log unknown ioctl requests as error Hans de Goede
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=20200623142401.3742-8-hdegoede@redhat.com \
--to=hdegoede@redhat.com \
--cc=arnd@arndb.de \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
/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®