<html>
  <head>

    <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
  </head>
  <body bgcolor="#FFFFFF" text="#000000">
    Just FYI<br>
    <div class="moz-forward-container"><br>
      Behan<br>
      <br>
      -------- Original Message --------
      <table class="moz-email-headers-table" cellpadding="0"
        cellspacing="0" border="0">
        <tbody>
          <tr>
            <th align="RIGHT" nowrap="nowrap" valign="BASELINE">Subject:
            </th>
            <td>Patch 'usb: gadget: FunctionFS: Remove VLAIS usage from
              gadget code' applied to my tree</td>
          </tr>
          <tr>
            <th align="RIGHT" nowrap="nowrap" valign="BASELINE">Date: </th>
            <td>Wed, 18 Dec 2013 09:28:59 -0600</td>
          </tr>
          <tr>
            <th align="RIGHT" nowrap="nowrap" valign="BASELINE">From: </th>
            <td><a class="moz-txt-link-rfc2396E" href="mailto:balbi@ti.com">&lt;balbi@ti.com&gt;</a></td>
          </tr>
          <tr>
            <th align="RIGHT" nowrap="nowrap" valign="BASELINE">To: </th>
            <td><a class="moz-txt-link-rfc2396E" href="mailto:andrzej.p@samsung.com">&lt;andrzej.p@samsung.com&gt;</a></td>
          </tr>
          <tr>
            <th align="RIGHT" nowrap="nowrap" valign="BASELINE">CC: </th>
            <td><a class="moz-txt-link-rfc2396E" href="mailto:charlebm@gmail.com">&lt;charlebm@gmail.com&gt;</a>,
              <a class="moz-txt-link-rfc2396E" href="mailto:behanw@converseincode.com">&lt;behanw@converseincode.com&gt;</a>,
              <a class="moz-txt-link-rfc2396E" href="mailto:andrzej.p@samsung.com">&lt;andrzej.p@samsung.com&gt;</a>,
              <a class="moz-txt-link-rfc2396E" href="mailto:kyungmin.park@samsung.com">&lt;kyungmin.park@samsung.com&gt;</a>,
              <a class="moz-txt-link-rfc2396E" href="mailto:mina86@mina86.com">&lt;mina86@mina86.com&gt;</a>, <a class="moz-txt-link-rfc2396E" href="mailto:balbi@ti.com">&lt;balbi@ti.com&gt;</a>,
              <a class="moz-txt-link-rfc2396E" href="mailto:balbi@ti.com">&lt;balbi@ti.com&gt;</a></td>
          </tr>
        </tbody>
      </table>
      <br>
      <br>
      <pre>Hi,

This is a note to let you know that the patch:

        usb: gadget: FunctionFS: Remove VLAIS usage from gadget code

has been applied to my tree and can be found at:

        <a class="moz-txt-link-freetext" href="http://bit.ly/19kVW3d">http://bit.ly/19kVW3d</a>

a snapshot of the tree can be downloaded from:

        <a class="moz-txt-link-freetext" href="http://bit.ly/1fazUAx">http://bit.ly/1fazUAx</a>

Note that it might take up to 20 minutes for kernel.org to synchronize
the changes to its frontend servers.

If you have any concerns, please let me know by replying to this mail.

>From e6f3862fa1ecea6579dd1727869655e88be7a5ef Mon Sep 17 00:00:00 2001
From: Andrzej Pietrasiewicz <a class="moz-txt-link-rfc2396E" href="mailto:andrzej.p@samsung.com">&lt;andrzej.p@samsung.com&gt;</a>
Date: Tue, 3 Dec 2013 15:15:30 +0100
Subject: [PATCH] usb: gadget: FunctionFS: Remove VLAIS usage from gadget code

The use of variable length arrays in structs (VLAIS) in the Linux Kernel code
precludes the use of compilers which don't implement VLAIS (for instance the
Clang compiler). This alternate patch calculates offsets into the kmalloc-ed
memory buffer using macros. The previous patch required multiple kmalloc and
kfree calls. This version uses "group" vs "struct" since it really is not a
struct and is essentially a group of VLA in a common allocated block. This
version also fixes the issues pointed out by Andrzej Pietrasiewicz and
Michal Nazarewicz.

Signed-off-by: Mark Charlebois <a class="moz-txt-link-rfc2396E" href="mailto:charlebm@gmail.com">&lt;charlebm@gmail.com&gt;</a>
Signed-off-by: Behan Webster <a class="moz-txt-link-rfc2396E" href="mailto:behanw@converseincode.com">&lt;behanw@converseincode.com&gt;</a>

[elimination of miexed declaration and code, checkpatch cleanup]
[fixes after Michal's review]
Signed-off-by: Andrzej Pietrasiewicz <a class="moz-txt-link-rfc2396E" href="mailto:andrzej.p@samsung.com">&lt;andrzej.p@samsung.com&gt;</a>
Signed-off-by: Kyungmin Park <a class="moz-txt-link-rfc2396E" href="mailto:kyungmin.park@samsung.com">&lt;kyungmin.park@samsung.com&gt;</a>
Acked-by: Michal Nazarewicz <a class="moz-txt-link-rfc2396E" href="mailto:mina86@mina86.com">&lt;mina86@mina86.com&gt;</a>
Signed-off-by: Felipe Balbi <a class="moz-txt-link-rfc2396E" href="mailto:balbi@ti.com">&lt;balbi@ti.com&gt;</a>
---
 drivers/usb/gadget/f_fs.c | 116 ++++++++++++++++++++++++++++++----------------
 1 file changed, 76 insertions(+), 40 deletions(-)

diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c
index 3494043..91b94b1 100644
--- a/drivers/usb/gadget/f_fs.c
+++ b/drivers/usb/gadget/f_fs.c
@@ -30,6 +30,31 @@
 
 #define FUNCTIONFS_MAGIC        0xa647361 /* Chosen by a honest dice roll ;) */
 
+/* Variable Length Array Macros **********************************************/
+#define vla_group(groupname) size_t groupname##__next = 0
+#define vla_group_size(groupname) groupname##__next
+
+#define vla_item(groupname, type, name, n) \
+        size_t groupname##_##name##__offset = ({                               \
+                size_t align_mask = __alignof__(type) - 1;                       \
+                size_t offset = (groupname##__next + align_mask) &amp; ~align_mask;\
+                size_t size = (n) * sizeof(type);                               \
+                groupname##__next = offset + size;                               \
+                offset;                                                               \
+        })
+
+#define vla_item_with_sz(groupname, type, name, n) \
+        size_t groupname##_##name##__sz = (n) * sizeof(type);                       \
+        size_t groupname##_##name##__offset = ({                               \
+                size_t align_mask = __alignof__(type) - 1;                       \
+                size_t offset = (groupname##__next + align_mask) &amp; ~align_mask;\
+                size_t size = groupname##_##name##__sz;                               \
+                groupname##__next = offset + size;                               \
+                offset;                                                               \
+        })
+
+#define vla_ptr(ptr, groupname, name) \
+        ((void *) ((char *)ptr + groupname##_##name##__offset))
 
 /* Debugging ****************************************************************/
 
@@ -1902,30 +1927,34 @@ static int __ffs_data_got_strings(struct ffs_data *ffs,
 
         /* Allocate everything in one chunk so there's less maintenance. */
         {
-                struct {
-                        struct usb_gadget_strings *stringtabs[lang_count + 1];
-                        struct usb_gadget_strings stringtab[lang_count];
-                        struct usb_string strings[lang_count*(needed_count+1)];
-                } *d;
                 unsigned i = 0;
+                vla_group(d);
+                vla_item(d, struct usb_gadget_strings *, stringtabs,
+                        lang_count + 1);
+                vla_item(d, struct usb_gadget_strings, stringtab, lang_count);
+                vla_item(d, struct usb_string, strings,
+                        lang_count*(needed_count+1));
 
-                d = kmalloc(sizeof *d, GFP_KERNEL);
-                if (unlikely(!d)) {
+                char *vlabuf = kmalloc(vla_group_size(d), GFP_KERNEL);
+
+                if (unlikely(!vlabuf)) {
                         kfree(_data);
                         return -ENOMEM;
                 }
 
-                stringtabs = d-&gt;stringtabs;
-                t = d-&gt;stringtab;
+                /* Initialize the VLA pointers */
+                stringtabs = vla_ptr(vlabuf, d, stringtabs);
+                t = vla_ptr(vlabuf, d, stringtab);
                 i = lang_count;
                 do {
                         *stringtabs++ = t++;
                 } while (--i);
                 *stringtabs = NULL;
 
-                stringtabs = d-&gt;stringtabs;
-                t = d-&gt;stringtab;
-                s = d-&gt;strings;
+                /* stringtabs = vlabuf = d_stringtabs for later kfree */
+                stringtabs = vla_ptr(vlabuf, d, stringtabs);
+                t = vla_ptr(vlabuf, d, stringtab);
+                s = vla_ptr(vlabuf, d, strings);
                 strings = s;
         }
 
@@ -2201,16 +2230,16 @@ static int ffs_func_bind(struct usb_configuration *c,
         int ret;
 
         /* Make it a single chunk, less management later on */
-        struct {
-                struct ffs_ep eps[ffs-&gt;eps_count];
-                struct usb_descriptor_header
-                        *fs_descs[full ? ffs-&gt;fs_descs_count + 1 : 0];
-                struct usb_descriptor_header
-                        *hs_descs[high ? ffs-&gt;hs_descs_count + 1 : 0];
-                short inums[ffs-&gt;interfaces_count];
-                char raw_descs[high ? ffs-&gt;raw_descs_length
-                                    : ffs-&gt;raw_fs_descs_length];
-        } *data;
+        vla_group(d);
+        vla_item_with_sz(d, struct ffs_ep, eps, ffs-&gt;eps_count);
+        vla_item_with_sz(d, struct usb_descriptor_header *, fs_descs,
+                full ? ffs-&gt;fs_descs_count + 1 : 0);
+        vla_item_with_sz(d, struct usb_descriptor_header *, hs_descs,
+                high ? ffs-&gt;hs_descs_count + 1 : 0);
+        vla_item_with_sz(d, short, inums, ffs-&gt;interfaces_count);
+        vla_item_with_sz(d, char, raw_descs,
+                high ? ffs-&gt;raw_descs_length : ffs-&gt;raw_fs_descs_length);
+        char *vlabuf;
 
         ENTER();
 
@@ -2218,21 +2247,28 @@ static int ffs_func_bind(struct usb_configuration *c,
         if (unlikely(!(full | high)))
                 return -ENOTSUPP;
 
-        /* Allocate */
-        data = kmalloc(sizeof *data, GFP_KERNEL);
-        if (unlikely(!data))
+        /* Allocate a single chunk, less management later on */
+        vlabuf = kmalloc(vla_group_size(d), GFP_KERNEL);
+        if (unlikely(!vlabuf))
                 return -ENOMEM;
 
         /* Zero */
-        memset(data-&gt;eps, 0, sizeof data-&gt;eps);
-        memcpy(data-&gt;raw_descs, ffs-&gt;raw_descs + 16, sizeof data-&gt;raw_descs);
-        memset(data-&gt;inums, 0xff, sizeof data-&gt;inums);
-        for (ret = ffs-&gt;eps_count; ret; --ret)
-                data-&gt;eps[ret].num = -1;
+        memset(vla_ptr(vlabuf, d, eps), 0, d_eps__sz);
+        memcpy(vla_ptr(vlabuf, d, raw_descs), ffs-&gt;raw_descs + 16,
+               d_raw_descs__sz);
+        memset(vla_ptr(vlabuf, d, inums), 0xff, d_inums__sz);
+        for (ret = ffs-&gt;eps_count; ret; --ret) {
+                struct ffs_ep *ptr;
+
+                ptr = vla_ptr(vlabuf, d, eps);
+                ptr[ret].num = -1;
+        }
 
-        /* Save pointers */
-        func-&gt;eps             = data-&gt;eps;
-        func-&gt;interfaces_nums = data-&gt;inums;
+        /* Save pointers
+         * d_eps == vlabuf, func-&gt;eps used to kfree vlabuf later
+        */
+        func-&gt;eps             = vla_ptr(vlabuf, d, eps);
+        func-&gt;interfaces_nums = vla_ptr(vlabuf, d, inums);
 
         /*
          * Go through all the endpoint descriptors and allocate
@@ -2240,10 +2276,10 @@ static int ffs_func_bind(struct usb_configuration *c,
          * numbers without worrying that it may be described later on.
          */
         if (likely(full)) {
-                func-&gt;function.fs_descriptors = data-&gt;fs_descs;
+                func-&gt;function.fs_descriptors = vla_ptr(vlabuf, d, fs_descs);
                 ret = ffs_do_descs(ffs-&gt;fs_descs_count,
-                                   data-&gt;raw_descs,
-                                   sizeof data-&gt;raw_descs,
+                                   vla_ptr(vlabuf, d, raw_descs),
+                                   d_raw_descs__sz,
                                    __ffs_func_bind_do_descs, func);
                 if (unlikely(ret &lt; 0))
                         goto error;
@@ -2252,10 +2288,10 @@ static int ffs_func_bind(struct usb_configuration *c,
         }
 
         if (likely(high)) {
-                func-&gt;function.hs_descriptors = data-&gt;hs_descs;
+                func-&gt;function.hs_descriptors = vla_ptr(vlabuf, d, hs_descs);
                 ret = ffs_do_descs(ffs-&gt;hs_descs_count,
-                                   data-&gt;raw_descs + ret,
-                                   (sizeof data-&gt;raw_descs) - ret,
+                                   vla_ptr(vlabuf, d, raw_descs) + ret,
+                                   d_raw_descs__sz - ret,
                                    __ffs_func_bind_do_descs, func);
                 if (unlikely(ret &lt; 0))
                         goto error;
@@ -2268,7 +2304,7 @@ static int ffs_func_bind(struct usb_configuration *c,
          */
         ret = ffs_do_descs(ffs-&gt;fs_descs_count +
                            (high ? ffs-&gt;hs_descs_count : 0),
-                           data-&gt;raw_descs, sizeof data-&gt;raw_descs,
+                           vla_ptr(vlabuf, d, raw_descs), d_raw_descs__sz,
                            __ffs_func_bind_do_nums, func);
         if (unlikely(ret &lt; 0))
                 goto error;
-- 
1.8.4.GIT

</pre>
      <br>
    </div>
    <br>
  </body>
</html>