From: Takashi Sakamoto <o-takashi@sakamocchi.jp>
To: oscar.carter@gmx.com, keescook@chromium.org, mchehab@kernel.org,
clemens@ladisch.de, tiwai@suse.de, perex@perex.cz
Cc: alsa-devel@alsa-project.org, kernel-hardening@lists.openwall.com,
linux-kernel@vger.kernel.org, stefanr@s5r6.in-berlin.de,
levonshe@gmail.com, linux1394-devel@lists.sourceforge.net,
linux-media@vger.kernel.org
Subject: [PATCH 2/2] firewire-core: obsolete cast of function callback
Date: Wed, 20 May 2020 15:47:26 +0900 [thread overview]
Message-ID: <20200520064726.31838-3-o-takashi@sakamocchi.jp> (raw)
In-Reply-To: <20200520064726.31838-1-o-takashi@sakamocchi.jp>
This commit obsoletes cast of function callback to assist attempt of
Control Flow Integrity builds.
Reported-by: Oscar Carter <oscar.carter@gmx.com>
Reference: https://lore.kernel.org/lkml/20200519173425.4724-1-oscar.carter@gmx.com/
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
---
drivers/firewire/core-cdev.c | 44 +++++++++++++++++++-----------------
1 file changed, 23 insertions(+), 21 deletions(-)
diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c
index 6e291d8f3a27..f1e83396dd22 100644
--- a/drivers/firewire/core-cdev.c
+++ b/drivers/firewire/core-cdev.c
@@ -957,7 +957,6 @@ static int ioctl_create_iso_context(struct client *client, union ioctl_arg *arg)
{
struct fw_cdev_create_iso_context *a = &arg->create_iso_context;
struct fw_iso_context *context;
- fw_iso_callback_t cb;
int ret;
BUILD_BUG_ON(FW_CDEV_ISO_CONTEXT_TRANSMIT != FW_ISO_CONTEXT_TRANSMIT ||
@@ -965,32 +964,35 @@ static int ioctl_create_iso_context(struct client *client, union ioctl_arg *arg)
FW_CDEV_ISO_CONTEXT_RECEIVE_MULTICHANNEL !=
FW_ISO_CONTEXT_RECEIVE_MULTICHANNEL);
- switch (a->type) {
- case FW_ISO_CONTEXT_TRANSMIT:
- if (a->speed > SCODE_3200 || a->channel > 63)
- return -EINVAL;
-
- cb = iso_callback;
- break;
+ if (a->type != FW_ISO_CONTEXT_RECEIVE_MULTICHANNEL) {
+ fw_iso_callback_t cb;
- case FW_ISO_CONTEXT_RECEIVE:
- if (a->header_size < 4 || (a->header_size & 3) ||
- a->channel > 63)
- return -EINVAL;
+ switch (a->type) {
+ case FW_ISO_CONTEXT_TRANSMIT:
+ if (a->speed > SCODE_3200 || a->channel > 63)
+ return -EINVAL;
- cb = iso_callback;
- break;
+ cb = iso_callback;
+ break;
- case FW_ISO_CONTEXT_RECEIVE_MULTICHANNEL:
- cb = (fw_iso_callback_t)iso_mc_callback;
- break;
+ case FW_ISO_CONTEXT_RECEIVE:
+ if (a->header_size < 4 || (a->header_size & 3) ||
+ a->channel > 63)
+ return -EINVAL;
- default:
- return -EINVAL;
- }
+ cb = iso_callback;
+ break;
+ default:
+ return -EINVAL;
+ }
- context = fw_iso_context_create(client->device->card, a->type,
+ context = fw_iso_context_create(client->device->card, a->type,
a->channel, a->speed, a->header_size, cb, client);
+ } else {
+ context = fw_iso_mc_context_create(client->device->card,
+ a->type, a->channel, a->speed, a->header_size,
+ iso_mc_callback, client);
+ }
if (IS_ERR(context))
return PTR_ERR(context);
if (client->version < FW_CDEV_VERSION_AUTO_FLUSH_ISO_OVERFLOW)
--
2.25.1
next prev parent reply other threads:[~2020-05-20 6:48 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-20 6:47 [PATCH 0/2] firewire: obsolete cast of function callback toward CFI Takashi Sakamoto
2020-05-20 6:47 ` [PATCH 1/2] firewire-core: add kernel API to construct multichannel isoc context Takashi Sakamoto
2020-05-20 6:47 ` Takashi Sakamoto [this message]
2020-05-22 17:35 ` [PATCH 0/2] firewire: obsolete cast of function callback toward CFI Oscar Carter
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=20200520064726.31838-3-o-takashi@sakamocchi.jp \
--to=o-takashi@sakamocchi.jp \
--cc=alsa-devel@alsa-project.org \
--cc=clemens@ladisch.de \
--cc=keescook@chromium.org \
--cc=kernel-hardening@lists.openwall.com \
--cc=levonshe@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux1394-devel@lists.sourceforge.net \
--cc=mchehab@kernel.org \
--cc=oscar.carter@gmx.com \
--cc=perex@perex.cz \
--cc=stefanr@s5r6.in-berlin.de \
--cc=tiwai@suse.de \
/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).