]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
Input: atmel_mxt_ts - add check for incorrect firmware file format
authorNick Dyer <nick.dyer@itdev.co.uk>
Mon, 19 May 2014 06:15:01 +0000 (23:15 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 19 May 2014 06:27:29 +0000 (23:27 -0700)
Atmel supplies firmware files in ASCII HEX format (.enc) which must be
converted before they can be loaded by kernel driver. Try to detect
the error and print a friendly error message rather than feeding junk
to the bootloader.

Signed-off-by: Nick Dyer <nick.dyer@itdev.co.uk>
Acked-by: Benson Leung <bleung@chromium.org>
Acked-by: Yufeng Shen <miletus@chromium.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/touchscreen/atmel_mxt_ts.c

index 9bf32c3b53aa504c8e671a07bdf764894ed8fab6..7a9197a19f679562678e423c33fe4fe90711fd9f 100644 (file)
@@ -1185,6 +1185,30 @@ done:
        return error ?: count;
 }
 
+static int mxt_check_firmware_format(struct device *dev,
+                                    const struct firmware *fw)
+{
+       unsigned int pos = 0;
+       char c;
+
+       while (pos < fw->size) {
+               c = *(fw->data + pos);
+
+               if (c < '0' || (c > '9' && c < 'A') || c > 'F')
+                       return 0;
+
+               pos++;
+       }
+
+       /*
+        * To convert file try:
+        * xxd -r -p mXTXXX__APP_VX-X-XX.enc > maxtouch.fw
+        */
+       dev_err(dev, "Aborting: firmware file must be in binary format\n");
+
+       return -EINVAL;
+}
+
 static int mxt_load_fw(struct device *dev, const char *fn)
 {
        struct mxt_data *data = dev_get_drvdata(dev);
@@ -1201,6 +1225,11 @@ static int mxt_load_fw(struct device *dev, const char *fn)
                return ret;
        }
 
+       /* Check for incorrect enc file */
+       ret = mxt_check_firmware_format(dev, fw);
+       if (ret)
+               goto release_firmware;
+
        ret = mxt_lookup_bootloader_address(data);
        if (ret)
                goto release_firmware;