From db17ee7330ca29d1485d2666be14c9dbd5f4352a Mon Sep 17 00:00:00 2001 From: Ethan Chen Date: Wed, 3 Jun 2015 22:39:00 -0500 Subject: [PATCH] d855: add assertions on baseband version Change-Id: I73870904f4309ebbc2e07ebc8f59050ebe9e31ec --- BoardConfig.mk | 7 ++ board-info.txt | 1 + device.mk | 6 +- recovery/Android.mk | 8 ++ recovery/recovery_updater.c | 183 ++++++++++++++++++++++++++++++++++++ releasetools.py | 36 +++++++ 6 files changed, 240 insertions(+), 1 deletion(-) create mode 100644 board-info.txt create mode 100644 recovery/Android.mk create mode 100644 recovery/recovery_updater.c create mode 100644 releasetools.py diff --git a/BoardConfig.mk b/BoardConfig.mk index 2eb92a2..04ca22d 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -19,6 +19,9 @@ TARGET_OTA_ASSERT_DEVICE := g3,d855 +# Assertions +TARGET_BOARD_INFO_FILE ?= device/lge/d855/board-info.txt + # Bluetooth BOARD_HAVE_BLUETOOTH_QCOM := true BLUETOOTH_HCI_USE_MCT := true @@ -48,6 +51,10 @@ TARGET_RECOVERY_FSTAB := device/lge/d855/rootdir/etc/fstab.g3 # NFC BOARD_NFC_CHIPSET := pn547 +# Releasetools +TARGET_RECOVERY_UPDATER_LIBS := librecovery_updater_g3 +TARGET_RELEASETOOLS_EXTENSIONS := device/lge/d855 + # Wifi BOARD_HAS_QCOM_WLAN := true BOARD_WLAN_DEVICE := qcwcn diff --git a/board-info.txt b/board-info.txt new file mode 100644 index 0000000..eb4fead --- /dev/null +++ b/board-info.txt @@ -0,0 +1 @@ +require version-baseband=MPSS.DI.2.0.1.C1.13.2-00002 diff --git a/device.mk b/device.mk index efa5104..8c133af 100644 --- a/device.mk +++ b/device.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2014 The CyanogenMod Project +# Copyright (C) 2016 The CyanogenMod Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -40,6 +40,10 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/gps.conf:system/etc/gps.conf +# Recovery +PRODUCT_PACKAGES += \ + librecovery_updater_g3 + # Wifi PRODUCT_PACKAGES += \ hostapd_default.conf \ diff --git a/recovery/Android.mk b/recovery/Android.mk new file mode 100644 index 0000000..84d1bfd --- /dev/null +++ b/recovery/Android.mk @@ -0,0 +1,8 @@ +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) +LOCAL_C_INCLUDES := bootable/recovery +LOCAL_SRC_FILES := recovery_updater.c +LOCAL_MODULE := librecovery_updater_g3 +LOCAL_MODULE_TAGS := eng +include $(BUILD_STATIC_LIBRARY) diff --git a/recovery/recovery_updater.c b/recovery/recovery_updater.c new file mode 100644 index 0000000..5efcfc3 --- /dev/null +++ b/recovery/recovery_updater.c @@ -0,0 +1,183 @@ +/* + * Copyright (C) 2016, The CyanogenMod Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "edify/expr.h" + +#define MAX(a, b) (((a) > (b)) ? (a) : (b)) + +#define ALPHABET_LEN 256 +#define KB 1024 + +#define BASEBAND_PART_PATH "/dev/block/platform/msm_sdcc.1/by-name/modem" +#define BASEBAND_VER_STR_START "MPSS.DI." +#define BASEBAND_VER_STR_START_LEN 8 +#define BASEBAND_VER_BUF_LEN 255 +#define BASEBAND_SZ 64000 * KB /* MMAP 64M of BASEBAND, BASEBAND partition is 64M */ + +/* Boyer-Moore string search implementation from Wikipedia */ + +/* Return longest suffix length of suffix ending at str[p] */ +static int max_suffix_len(const char *str, size_t str_len, size_t p) { + uint32_t i; + + for (i = 0; (str[p - i] == str[str_len - 1 - i]) && (i < p); ) { + i++; + } + + return i; +} + +/* Generate table of distance between last character of pat and rightmost + * occurrence of character c in pat + */ +static void bm_make_delta1(int *delta1, const char *pat, size_t pat_len) { + uint32_t i; + for (i = 0; i < ALPHABET_LEN; i++) { + delta1[i] = pat_len; + } + for (i = 0; i < pat_len - 1; i++) { + uint8_t idx = (uint8_t) pat[i]; + delta1[idx] = pat_len - 1 - i; + } +} + +/* Generate table of next possible full match from mismatch at pat[p] */ +static void bm_make_delta2(int *delta2, const char *pat, size_t pat_len) { + int p; + uint32_t last_prefix = pat_len - 1; + + for (p = pat_len - 1; p >= 0; p--) { + /* Compare whether pat[p-pat_len] is suffix of pat */ + if (strncmp(pat + p, pat, pat_len - p) == 0) { + last_prefix = p + 1; + } + delta2[p] = last_prefix + (pat_len - 1 - p); + } + + for (p = 0; p < (int) pat_len - 1; p++) { + /* Get longest suffix of pattern ending on character pat[p] */ + int suf_len = max_suffix_len(pat, pat_len, p); + if (pat[p - suf_len] != pat[pat_len - 1 - suf_len]) { + delta2[pat_len - 1 - suf_len] = pat_len - 1 - p + suf_len; + } + } +} + +static char * bm_search(const char *str, size_t str_len, const char *pat, + size_t pat_len) { + int delta1[ALPHABET_LEN]; + int delta2[pat_len]; + int i; + + bm_make_delta1(delta1, pat, pat_len); + bm_make_delta2(delta2, pat, pat_len); + + if (pat_len == 0) { + return (char *) str; + } + + i = pat_len - 1; + while (i < (int) str_len) { + int j = pat_len - 1; + while (j >= 0 && (str[i] == pat[j])) { + i--; + j--; + } + if (j < 0) { + return (char *) (str + i + 1); + } + i += MAX(delta1[(uint8_t) str[i]], delta2[j]); + } + + return NULL; +} + +static int get_baseband_version(char *ver_str, size_t len) { + int ret = 0; + int fd; + char *baseband_data = NULL; + char *offset = NULL; + + fd = open(BASEBAND_PART_PATH, O_RDONLY); + if (fd < 0) { + ret = errno; + goto err_ret; + } + + baseband_data = (char *) mmap(NULL, BASEBAND_SZ, PROT_READ, MAP_PRIVATE, fd, 0); + if (baseband_data == (char *)-1) { + ret = errno; + goto err_fd_close; + } + + /* Do Boyer-Moore search across BASEBAND data */ + offset = bm_search(baseband_data, BASEBAND_SZ, BASEBAND_VER_STR_START, BASEBAND_VER_STR_START_LEN); + if (offset != NULL) { + strncpy(ver_str, offset, len); + } else { + ret = -ENOENT; + } + + munmap(baseband_data, BASEBAND_SZ); +err_fd_close: + close(fd); +err_ret: + return ret; +} + +/* verify_baseband("BASEBAND_VERSION", "BASEBAND_VERSION", ...) */ +Value * VerifyBasebandFn(const char *name, State *state, int argc, Expr *argv[]) { + char current_baseband_version[BASEBAND_VER_BUF_LEN]; + char *baseband_version; + int i, ret; + + ret = get_baseband_version(current_baseband_version, BASEBAND_VER_BUF_LEN); + if (ret) { + return ErrorAbort(state, "%s() failed to read current BASEBAND version: %d", + name, ret); + } + + for (i = 1; i <= argc; i++) { + ret = ReadArgs(state, argv, i, &baseband_version); + if (ret < 0) { + return ErrorAbort(state, "%s() error parsing arguments: %d", + name, ret); + } + + uiPrintf(state, "Comparing BASEBAND version %s to %s", + baseband_version, current_baseband_version); + if (strncmp(baseband_version, current_baseband_version, strlen(baseband_version)) == 0) { + return StringValue(strdup("1")); + } + } + + return StringValue(strdup("0")); +} + +void Register_librecovery_updater_g3() { + RegisterFunction("g3.verify_baseband", VerifyBasebandFn); +} diff --git a/releasetools.py b/releasetools.py new file mode 100644 index 0000000..72d362f --- /dev/null +++ b/releasetools.py @@ -0,0 +1,36 @@ +# Copyright (C) 2009 The Android Open Source Project +# Copyright (c) 2011, The Linux Foundation. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import hashlib +import common +import re + +def FullOTA_Assertions(info): + AddBasebandAssertion(info) + return + +def IncrementalOTA_Assertions(info): + AddBasebandAssertion(info) + return + +def AddBasebandAssertion(info): + android_info = info.input_zip.read("OTA/android-info.txt") + m = re.search(r'require\s+version-baseband\s*=\s*(\S+)', android_info) + if m: + versions = m.group(1).split('|') + if len(versions) and '*' not in versions: + cmd = 'assert(g3.verify_baseband(' + ','.join(['"%s"' % baseband for baseband in versions]) + ') == "1");' + info.script.AppendExtra(cmd) + return