Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp2475758lqp; Sun, 24 Mar 2024 22:28:13 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWp8uQip6D0bVKRpRmf8PccRUqRL5bAfuJtKDfiMXsRuVrWUzF32jABX+FCK6kUx7HglmCQAMLCvOmqSK2YCQBbG5JAiE/tbutTWSoprw== X-Google-Smtp-Source: AGHT+IE9XluoEcPYzTy3YUOBiFX6Tp+50VSNpeT7ZJSoA7b/I6DwmZ0BNBZnAErTzpdz6w+dAw0p X-Received: by 2002:a17:902:dacc:b0:1e0:c7b6:ef4a with SMTP id q12-20020a170902dacc00b001e0c7b6ef4amr620157plx.40.1711344493178; Sun, 24 Mar 2024 22:28:13 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711344493; cv=pass; d=google.com; s=arc-20160816; b=Kyx8vhsMEZcwC3+UmMLUlO3aiyj43izmAZKnYgI5fCzKXj5clMpc+OZgpzhZh5omE9 nSJ+6FR7Ce8zzxz86FYY+TVbQaJ0cFbCDe3oKs3jHso+W+lPBB0JxvfvvmbQGrCPlqGN tdTTXogJvYGPMXdB+9CgA4SeMW3v9zYXAHloq6txi7PEuE4d2HJuuB3E0mMLY814QS5H fZGoz0OVHea4Wh+4te7eHoi5K5lOdBT98DuP1Eo+zqGnrMuVAWT4JgdSmg/qZpJQiqNP WuZDiW1G6MzyzLK2kR5nDhtBUsiVl6yaOT5ojEA4IRWSgxCbe8gQGrTMhN9M2/UH8bwE G/WQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=d93Iq979C00Cm0nW9rrP/eD0YsyGTG7ZcwWQ/HG1W4g=; fh=bMNKZ7ybmBmtJ9ZN0DsIraF1RdLwlTOItTNQ9utm064=; b=hJAJFDMztOVFPrKoYPNp7t2mELWHYiUO5+QPSBYSQVx31wzPKgYPpai9jGJlQPrrsp NRi0tNy7GXdtpOUHmoZinPjuGrt9Crc3QVdmLQnBbd2OF0Qtp2sRa557yR+SzLeXlUj/ JKC+J3qjPvoohHYHXYlips+M8SqbhRldz+lrShIFlFs/oODAaZncOAkjpQaTAP9DHYCE ShqgXHcpbPxqPJlSMAb4ypSWsLKPVfxjEYkz6CwoBJopUPy23P92mo8c2/+zL5DacD7W pLYPTxqOkQsfWDjFoeUGCGQeiBhJc/3gRVnIEKS5JC2CHGp59J/MRapTlKIKXFEEm8MU Pung==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=qdgIA68f; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-113851-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-113851-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id y11-20020a17090322cb00b001e01d62454csi4717278plg.56.2024.03.24.22.28.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Mar 2024 22:28:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-113851-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=qdgIA68f; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-113851-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-113851-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id BD90B28E88E for ; Mon, 25 Mar 2024 05:26:15 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1D44D2062F1; Sun, 24 Mar 2024 23:04:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="qdgIA68f" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D2ACF129A8D; Sun, 24 Mar 2024 22:54:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711320891; cv=none; b=nvDYUTn97VAJ/UwtIuz8Net+/qyLZBasmyjpzMYBK8/2jATC4SdKXEL2UYHddLzvewfZ54q9JUI/gxZvsS1FSrO+owhgmNOvcVXjAh1aZxItXN2wRF+oLLBWH95fv0XRgRm8JbGFvNlf/SkTgP4awgUy714Wstixlg22skBM54I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711320891; c=relaxed/simple; bh=h8BdH7BljQ0FdEXcZo6/KF7jYRa7kna71QzsImwJywI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LgEJohrAlNPeiMq7/X+OKcjdbilY3a7nWaZAHMZLPYRRC63dWrMCayzhlRaU/fPhzQfgdcGBM0ElEiQXtveCM56tTLWIdT86/BAz334zpDwgxOtFAAdgl2zaBcq9x4wjkfSZdIONwFEEEawOLqM4g4q/r3WFrCWfGNsh6O7KeeM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=qdgIA68f; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 203ADC433A6; Sun, 24 Mar 2024 22:54:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711320890; bh=h8BdH7BljQ0FdEXcZo6/KF7jYRa7kna71QzsImwJywI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qdgIA68fWnBx7sFi2iqjIweL5LYWT0AA4OJxlCpXdIsETb5o4K4PK9NdGD0a+nzhs 8/xGeRac/WK8H9d0sT68y2Py4cBRKvIeYpoY1md/GpSdWEuDaQxEbwlQxJ0N8MLOBE BQmJMiUenXi/dx4WckEItjzm2TQjgn0HyCz0DdTv0RtctTfNod1yT5wUtahP21V3U/ ZPBzDdFB3F1p5WHlstnwH2dJqZ21ucbYwAI60y5A7csuwrBYmpXbmFoLnAtIrE/lpd SpRBTfoTK5T41I+fWPhu8tpTm1XFKrhqojzIAI1T9NgI4E1i6UFi8KpdUBFmtvZ21W T4JPy1EzVeTSw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Takashi Iwai , Arnd Bergmann , Sasha Levin Subject: [PATCH 6.7 455/713] ALSA: seq: fix function cast warnings Date: Sun, 24 Mar 2024 18:43:01 -0400 Message-ID: <20240324224720.1345309-456-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324224720.1345309-1-sashal@kernel.org> References: <20240324224720.1345309-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Takashi Iwai [ Upstream commit d7bf73809849463f76de42aad62c850305dd6c5d ] clang-16 points out a control flow integrity (kcfi) issue when event callbacks get converted to incompatible types: sound/core/seq/seq_midi.c:135:30: error: cast from 'int (*)(struct snd_rawmidi_substream *, const char *, int)' to 'snd_seq_dump_func_t' (aka 'int (*)(void *, void *, int)') converts to incompatible function type [-Werror,-Wcast-function-type-strict] 135 | snd_seq_dump_var_event(ev, (snd_seq_dump_func_t)dump_midi, substream); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ sound/core/seq/seq_virmidi.c:83:31: error: cast from 'int (*)(struct snd_rawmidi_substream *, const unsigned char *, int)' to 'snd_seq_dump_func_t' (aka 'int (*)(void *, void *, int)') converts to incompatible function type [-Werror,-Wcast-function-type-strict] 83 | snd_seq_dump_var_event(ev, (snd_seq_dump_func_t)snd_rawmidi_receive, vmidi->substream); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ For addressing those errors, introduce wrapper functions that are used for callbacks and bridge to the actual function call with pointer cast. The code was originally added with the initial ALSA merge in linux-2.5.4. [ the patch description shamelessly copied from Arnd's original patch -- tiwai ] Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Reported-by: Arnd Bergmann Link: https://lore.kernel.org/r/20240213101020.459183-1-arnd@kernel.org Link: https://lore.kernel.org/r/20240213135343.16411-1-tiwai@suse.de Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/core/seq/seq_midi.c | 8 +++++++- sound/core/seq/seq_virmidi.c | 9 ++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/sound/core/seq/seq_midi.c b/sound/core/seq/seq_midi.c index 18320a248aa7d..78dcb0ea15582 100644 --- a/sound/core/seq/seq_midi.c +++ b/sound/core/seq/seq_midi.c @@ -113,6 +113,12 @@ static int dump_midi(struct snd_rawmidi_substream *substream, const char *buf, i return 0; } +/* callback for snd_seq_dump_var_event(), bridging to dump_midi() */ +static int __dump_midi(void *ptr, void *buf, int count) +{ + return dump_midi(ptr, buf, count); +} + static int event_process_midi(struct snd_seq_event *ev, int direct, void *private_data, int atomic, int hop) { @@ -132,7 +138,7 @@ static int event_process_midi(struct snd_seq_event *ev, int direct, pr_debug("ALSA: seq_midi: invalid sysex event flags = 0x%x\n", ev->flags); return 0; } - snd_seq_dump_var_event(ev, (snd_seq_dump_func_t)dump_midi, substream); + snd_seq_dump_var_event(ev, __dump_midi, substream); snd_midi_event_reset_decode(msynth->parser); } else { if (msynth->parser == NULL) diff --git a/sound/core/seq/seq_virmidi.c b/sound/core/seq/seq_virmidi.c index 1b9260108e482..1678737f11be7 100644 --- a/sound/core/seq/seq_virmidi.c +++ b/sound/core/seq/seq_virmidi.c @@ -62,6 +62,13 @@ static void snd_virmidi_init_event(struct snd_virmidi *vmidi, /* * decode input event and put to read buffer of each opened file */ + +/* callback for snd_seq_dump_var_event(), bridging to snd_rawmidi_receive() */ +static int dump_to_rawmidi(void *ptr, void *buf, int count) +{ + return snd_rawmidi_receive(ptr, buf, count); +} + static int snd_virmidi_dev_receive_event(struct snd_virmidi_dev *rdev, struct snd_seq_event *ev, bool atomic) @@ -80,7 +87,7 @@ static int snd_virmidi_dev_receive_event(struct snd_virmidi_dev *rdev, if (ev->type == SNDRV_SEQ_EVENT_SYSEX) { if ((ev->flags & SNDRV_SEQ_EVENT_LENGTH_MASK) != SNDRV_SEQ_EVENT_LENGTH_VARIABLE) continue; - snd_seq_dump_var_event(ev, (snd_seq_dump_func_t)snd_rawmidi_receive, vmidi->substream); + snd_seq_dump_var_event(ev, dump_to_rawmidi, vmidi->substream); snd_midi_event_reset_decode(vmidi->parser); } else { len = snd_midi_event_decode(vmidi->parser, msg, sizeof(msg), ev); -- 2.43.0