From patchwork Fri Jun 19 18:34:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tedd Ho-Jeong An X-Patchwork-Id: 11614917 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BC167618 for ; Fri, 19 Jun 2020 18:35:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AC22B214D8 for ; Fri, 19 Jun 2020 18:35:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388087AbgFSSfK (ORCPT ); Fri, 19 Jun 2020 14:35:10 -0400 Received: from mga14.intel.com ([192.55.52.115]:3425 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728430AbgFSSfI (ORCPT ); Fri, 19 Jun 2020 14:35:08 -0400 IronPort-SDR: hZ+sW2wz8Lbq7wWmiTPuZjdKUYnb6ZL/NNeGd0B5NUBCUuqO8hKE44i5HJbdVPYaoU5RjtiG6u OlnA75tpBuOA== X-IronPort-AV: E=McAfee;i="6000,8403,9657"; a="142134879" X-IronPort-AV: E=Sophos;i="5.75,256,1589266800"; d="scan'208";a="142134879" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jun 2020 11:35:06 -0700 IronPort-SDR: JL9w5/NIR8gTsVcoU1tM/ELSgkWZKzp54pNUQHxD6I9eU9QUyUB0E1DPizhTSfh7UCHE8N2OOm zlDwOIcp8neA== X-IronPort-AV: E=Sophos;i="5.75,256,1589266800"; d="scan'208";a="300155234" Received: from han1-mobl3.jf.intel.com ([10.254.73.18]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jun 2020 11:35:06 -0700 From: tedd.an@linux.intel.com To: linux-bluetooth@vger.kernel.org Cc: Tedd Ho-Jeong An Subject: [PATCH V2 1/2] midi: Fix SysEx parser in MIDI plugin Date: Fri, 19 Jun 2020 11:34:55 -0700 Message-Id: <20200619183456.38696-1-tedd.an@linux.intel.com> X-Mailer: git-send-email 2.25.4 MIME-Version: 1.0 Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Tedd Ho-Jeong An The SysEx end of message parser didn't consider the fact that timestampsLow are in the stream and it might have the EOX (F7) byte as well. Fix that by always assuming the first system message byte is the timestampLow. Future work would involve support other type of system message bytes, such as real-time. --- profiles/midi/libmidi.c | 38 +++++++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/profiles/midi/libmidi.c b/profiles/midi/libmidi.c index 4b4df799f..7d57e7335 100644 --- a/profiles/midi/libmidi.c +++ b/profiles/midi/libmidi.c @@ -331,6 +331,30 @@ static size_t handle_end_of_sysex(struct midi_read_parser *parser, return sysex_length + 1; /* +1 because of timestampLow */ } +/* Searches the end of a SysEx message that contains a timestampLow + * before the SysEx end byte. Returns the number of bytes of valid + * SysEx payload in the buffer. + */ +static size_t sysex_eox_len(const uint8_t *data, size_t size) +{ + size_t i = 0; + + MIDI_ASSERT(size > 0); + + if (data[i] == 0xF0) + i++; + + /* Search for timestamp low */ + while (i < size) { + if ((data[i] & 0x80)) { + i++; + break; + } + i++; + } + + return (i < size && data[i] == 0xF7) ? i : 0; +} size_t midi_read_raw(struct midi_read_parser *parser, const uint8_t *data, @@ -368,14 +392,14 @@ size_t midi_read_raw(struct midi_read_parser *parser, const uint8_t *data, /* System Common Messages */ case 0xF0: /* SysEx Start */ { - uint8_t *pos; + size_t sysex_length; /* cleanup Running Status Message */ parser->rstatus = 0; - /* Avoid parsing if SysEx is contained in one BLE packet */ - if ((pos = memchr(data + i, 0xF7, size - i))) { - const size_t sysex_length = pos - (data + i); + sysex_length = sysex_eox_len(data + i, size - i); + /* Search for End of SysEx message in one BLE message */ + if (sysex_length > 0) { midi_size = handle_end_of_sysex(parser, ev, data + i, sysex_length); } else { @@ -424,10 +448,10 @@ size_t midi_read_raw(struct midi_read_parser *parser, const uint8_t *data, /* Check for SysEx messages */ if (parser->sysex_stream.len > 0) { - uint8_t *pos; + size_t sysex_length; - if ((pos = memchr(data + i, 0xF7, size - i))) { - const size_t sysex_length = pos - (data + i); + sysex_length = sysex_eox_len(data + i, size - i); + if (sysex_length > 0) { midi_size = handle_end_of_sysex(parser, ev, data + i, sysex_length); } else { From patchwork Fri Jun 19 18:34:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tedd Ho-Jeong An X-Patchwork-Id: 11614919 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 36E1C1731 for ; Fri, 19 Jun 2020 18:35:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1F0F120DD4 for ; Fri, 19 Jun 2020 18:35:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388090AbgFSSfK (ORCPT ); Fri, 19 Jun 2020 14:35:10 -0400 Received: from mga14.intel.com ([192.55.52.115]:3425 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388046AbgFSSfJ (ORCPT ); Fri, 19 Jun 2020 14:35:09 -0400 IronPort-SDR: UbyXNNBdMN3By+RzqX82d1W7P9OkG02m0U5x9Yor4oD5lwlDfbnaqNvfISelKoRmFUOEGomSdJ uxtK0urx/RTQ== X-IronPort-AV: E=McAfee;i="6000,8403,9657"; a="142134880" X-IronPort-AV: E=Sophos;i="5.75,256,1589266800"; d="scan'208";a="142134880" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jun 2020 11:35:06 -0700 IronPort-SDR: YbuptxrN76HaEXTGK1GHOICxy5tPkaU0Zjarz852CR/N1DVb4RpVGxveTriSOf6KeO+2xKTVc3 q3qyonAQOGIg== X-IronPort-AV: E=Sophos;i="5.75,256,1589266800"; d="scan'208";a="300155240" Received: from han1-mobl3.jf.intel.com ([10.254.73.18]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jun 2020 11:35:06 -0700 From: tedd.an@linux.intel.com To: linux-bluetooth@vger.kernel.org Cc: Tedd Ho-Jeong An Subject: [PATCH V2 2/2] midi: Fix random empty timestamp_high value Date: Fri, 19 Jun 2020 11:34:56 -0700 Message-Id: <20200619183456.38696-2-tedd.an@linux.intel.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20200619183456.38696-1-tedd.an@linux.intel.com> References: <20200619183456.38696-1-tedd.an@linux.intel.com> MIME-Version: 1.0 Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Tedd Ho-Jeong An The timestamp_high value is assigned from the monotonic time but there is a chance that the value becomes zero because it reads the value between bit8 and bit13. This patch makes sure the timestamp_high value get a non-zero value. --- profiles/midi/libmidi.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/profiles/midi/libmidi.c b/profiles/midi/libmidi.c index 7d57e7335..cb2787db1 100644 --- a/profiles/midi/libmidi.c +++ b/profiles/midi/libmidi.c @@ -77,8 +77,13 @@ inline static void append_timestamp_high_maybe(struct midi_write_parser *parser) if (midi_write_has_data(parser)) return; - parser->rtime = g_get_monotonic_time() / 1000; /* convert µs to ms */ - timestamp_high |= (parser->rtime & 0x1F80) >> 7; + /* Make sure timesampt_high is assigned a non-zero value */ + do { + /* convert µs to ms */ + parser->rtime = g_get_monotonic_time() / 1000; + timestamp_high |= (parser->rtime & 0x1F80) >> 7; + } while (timestamp_high == 0x80); + /* set timestampHigh */ buffer_append_byte(&parser->midi_stream, timestamp_high); }