| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <xa1tsinee63o.fsf@mina86.com>
Date: Mon, 09 Jun 2014 12:21:15 +0200
From: Michal Nazarewicz <mina86@...a86.com>
To: Krzysztof Opasiak <k.opasiak@...sung.com>,
'Felipe Balbi' <balbi@...com>,
Krzysztof Opasiak <k.opasiak@...sung.com>
Cc: linux-usb@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: [PATCHv3] tools: ffs-test: add compatibility code for old kernels
If ffs-test is used with a kernel prior to 3.14, which do not
support the new descriptors format, it will fail when trying to
write the descriptors. Add a function that converts the new
descriptors to the legacy ones and use it to retry writing the
descriptors using the legacy format.
Also add “-l” flag to ffs-test which will cause the tool to
never try the new format and instead immediatelly try the
legacy one. This should be useful to test whether parsing
of the old format still works on given 3.14+ kernel.
---
tools/usb/ffs-test.c | 105 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 100 insertions(+), 5 deletions(-)
diff --git a/tools/usb/ffs-test.c b/tools/usb/ffs-test.c
index 708d317..afd69ea 100644
--- a/tools/usb/ffs-test.c
+++ b/tools/usb/ffs-test.c
@@ -29,6 +29,7 @@
#include <fcntl.h>
#include <pthread.h>
#include <stdarg.h>
+#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -172,6 +173,82 @@ static const struct {
},
};
+static size_t descs_to_legacy(void **legacy, const void *descriptors) {
+ __u32 length, flags, fs_count = 0, hs_count = 0, count;
+ const unsigned char *descs, *usb_descs;
+
+ /* Read v2 header */
+ {
+ const struct usb_functionfs_descs_head_v2 *head = descriptors;
+
+ if (le32_to_cpu(head->magic) !=
+ FUNCTIONFS_DESCRIPTORS_MAGIC_V2)
+ return 0;
+ length = le32_to_cpu(head->length);
+ if (length <= sizeof *head)
+ return 0;
+ flags = le32_to_cpu(head->flags);
+ descs = (const void *)(head + 1);
+ length -= sizeof *head;
+ }
+
+ /* Read v2 counts */
+#define GET_LE32(ret) do { \
+ if (length < 4) \
+ return 0; \
+ ret = le32_to_cpu(*(const __le32 *)descs); \
+ descs += 4; \
+ length -= 4; \
+ } while (0)
+
+ if (flags & FUNCTIONFS_HAS_FS_DESC)
+ GET_LE32(fs_count);
+ if (flags & FUNCTIONFS_HAS_HS_DESC)
+ GET_LE32(hs_count);
+ if (!fs_count && !hs_count)
+ return 0;
+ if (flags & FUNCTIONFS_HAS_SS_DESC)
+ /* Legacy does not support SS so this is ignored. */
+ GET_LE32(count);
+ if (flags & ~(FUNCTIONFS_HAS_FS_DESC | FUNCTIONFS_HAS_HS_DESC |
+ FUNCTIONFS_HAS_SS_DESC))
+ return 0;
+
+#undef GET_LE32
+
+ /*
+ * Find the end of FS and HS USB descriptors. SS descriptors
+ * are ignored since legacy format does not support them.
+ */
+ count = fs_count + hs_count;
+ usb_descs = descs;
+ do {
+ if (length < *descs)
+ return 0;
+ length -= *descs;
+ descs += *descs;
+ } while (--count);
+
+ /* Allocate legacy descriptors and copy the data. */
+ {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+ struct usb_functionfs_descs_head *head;
+#pragma GCC diagnostic pop
+
+ length = sizeof *head + (descs - usb_descs);
+ head = malloc(length);
+ head->magic = cpu_to_le32(FUNCTIONFS_DESCRIPTORS_MAGIC);
+ head->length = cpu_to_le32(length);
+ head->fs_count = cpu_to_le32(fs_count);
+ head->hs_count = cpu_to_le32(hs_count);
+ memcpy(head + 1, usb_descs, descs - usb_descs);
+ *legacy = head;
+ }
+
+ return length;
+}
+
#define STR_INTERFACE_ "Source/Sink"
@@ -491,12 +568,29 @@ ep0_consume(struct thread *ignore, const void *buf, size_t nbytes)
return nbytes;
}
-static void ep0_init(struct thread *t)
+static void ep0_init(struct thread *t, bool legacy_descriptors)
{
+ void *legacy;
ssize_t ret;
+ size_t len;
+
+ if (legacy_descriptors) {
+ info("%s: writing descriptors\n", t->filename);
+ goto legacy;
+ }
- info("%s: writing descriptors\n", t->filename);
+ info("%s: writing descriptors (in v2 format)\n", t->filename);
ret = write(t->fd, &descriptors, sizeof descriptors);
+
+ if (ret < 0 && errno == EINVAL) {
+ warn("%s: new format rejected, trying legacy\n", t->filename);
+legacy:
+ len = descs_to_legacy(&legacy, &descriptors);
+ if (len) {
+ ret = write(t->fd, legacy, len);
+ free(legacy);
+ }
+ }
die_on(ret < 0, "%s: write: descriptors", t->filename);
info("%s: writing strings\n", t->filename);
@@ -507,14 +601,15 @@ static void ep0_init(struct thread *t)
/******************** Main **************************************************/
-int main(void)
+int main(int argc, char **argv)
{
+ bool legacy_descriptors;
unsigned i;
- /* XXX TODO: Argument parsing missing */
+ legacy_descriptors = argc > 2 && !strcmp(argv[1], "-l");
init_thread(threads);
- ep0_init(threads);
+ ep0_init(threads, legacy_descriptors);
for (i = 1; i < sizeof threads / sizeof *threads; ++i)
init_thread(threads + i);
--
2.0.0.526.g5318336
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists