May 2017 - U-Boot

[U-Boot] [PATCH] tools/genboardscfg.py: Make 'Supported' as known status
by Lokesh Vutla 12 May '17

12 May '17

As per MAINTAINERS[1] file description, 'Supported' is a valid status for a board. But buildman thinks 'Maintained' is the only valid state and complains about boards with 'Supported' status. Update buildman to accept 'Supported' as valid state. [1] http://git.denx.de/?p=u-boot.git;a=blob;f=MAINTAINERS;h=0962b47bf9057b22e93… Reported-by: Sekhar Nori <nsekhar(a)ti.com> Signed-off-by: Lokesh Vutla <lokeshvutla(a)ti.com> --- tools/genboardscfg.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/genboardscfg.py b/tools/genboardscfg.py index c2efad55ab..2e871feaf4 100755 --- a/tools/genboardscfg.py +++ b/tools/genboardscfg.py @@ -294,6 +294,8 @@ class MaintainersDatabase: tmp = self.database[target][0] if tmp.startswith('Maintained'): return 'Active' + elif tmp.startswith('Supported'): + return 'Active' elif tmp.startswith('Orphan'): return 'Orphan' else: -- 2.11.0

3 3

[U-Boot] [PATCH v7] usb: gadget: avoid variable name clipping in cb_getvar
by nicolas.le.bayon＠st.com 12 May '17

12 May '17

From: Nicolas Le Bayon <nicolas.le.bayon(a)st.com> Instead of using a fixed-size array to store variable name, preferring a dynamic allocation treats correctly all variable name lengths. Variable names are growing through releases and features. By this way, name clipping is prevented. Signed-off-by: Nicolas Le Bayon <nicolas.le.bayon(a)st.com> Reviewed-by: Marek Vasut <marex(a)denx.de> Acked-by: Lukasz Majewski <lukma(a)denx.de> --- Changes in v2: - instead of using a bigger fixed size, use malloc to fit with size needs Changes in v3: - v2 was an error (intermediate version), so propose a complete one Changes in v4: - be more explicit and detailed in label and description fields - remove intermediate variable only used one time - be more explicit in error message - fix indent issue Changes in v5: - drop an unuseful error() call Changes in v6: - add Marek review approval Changes in v7: - add Lukasz ack approval drivers/usb/gadget/f_fastboot.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c index 2160b1c..7cd6d24 100644 --- a/drivers/usb/gadget/f_fastboot.c +++ b/drivers/usb/gadget/f_fastboot.c @@ -432,9 +432,15 @@ static void cb_getvar(struct usb_ep *ep, struct usb_request *req) else strcpy(response, "FAILValue not set"); } else { - char envstr[32]; + char *envstr; - snprintf(envstr, sizeof(envstr) - 1, "fastboot.%s", cmd); + envstr = malloc(strlen("fastboot.") + strlen(cmd) + 1); + if (!envstr) { + fastboot_tx_write_str("FAILmalloc error"); + return; + } + + sprintf(envstr, "fastboot.%s", cmd); s = getenv(envstr); if (s) { strncat(response, s, chars_left); @@ -442,6 +448,8 @@ static void cb_getvar(struct usb_ep *ep, struct usb_request *req) printf("WARNING: unknown variable: %s\n", cmd); strcpy(response, "FAILVariable not implemented"); } + + free(envstr); } fastboot_tx_write_str(response); } -- 1.9.1

4 3

[U-Boot] [PATCH V2 1/2] arm: change tbu/l type to unsigned int
by Peng Fan 12 May '17

12 May '17

Change tbu/l type to unsigned int. >From the timer file for arm, "(((unsigned long long)gd->arch.tbu) << 32) | gd->arch.tbl;" is used, This piece code is based on tbu/tbl is 32bits, so change the type to unsigned int. Signed-off-by: Peng Fan <peng.fan(a)nxp.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Tom Rini <trini(a)konsulko.com> --- V2: Add more commit log arch/arm/include/asm/global_data.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/include/asm/global_data.h b/arch/arm/include/asm/global_data.h index 1aab629..3cc0e5f 100644 --- a/arch/arm/include/asm/global_data.h +++ b/arch/arm/include/asm/global_data.h @@ -32,8 +32,8 @@ struct arch_global_data { #endif /* "static data" needed by most of timer.c on ARM platforms */ unsigned long timer_rate_hz; - unsigned long tbu; - unsigned long tbl; + unsigned int tbu; + unsigned int tbl; unsigned long lastinc; unsigned long long timer_reset_value; #if !(defined(CONFIG_SYS_ICACHE_OFF) && defined(CONFIG_SYS_DCACHE_OFF)) -- 2.6.6

2 3

[U-Boot] [PATCH 01/17] socrates: Fix a misleading indentation warning
by Tom Rini 12 May '17

12 May '17

With gcc-6 and later we see a warning about the fact that we have a construct of "if (test);\n\tstatement". Upon reviewing the code, the intention here is as the compiler suggests, we only want to execute the indented statement if the test was true. Cc: Sergei Poselenov <sposelenov(a)emcraft.com> Signed-off-by: Tom Rini <trini(a)konsulko.com> --- board/socrates/socrates.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/socrates/socrates.c b/board/socrates/socrates.c index 8b34a80e8f72..fb691c22d961 100644 --- a/board/socrates/socrates.c +++ b/board/socrates/socrates.c @@ -378,7 +378,7 @@ static void board_backlight_brightness(int br) /* LEDs on */ reg = in_be32((void *)(CONFIG_SYS_FPGA_BASE + 0x0c)); - if (!(reg & BACKLIGHT_ENABLE)); + if (!(reg & BACKLIGHT_ENABLE)) out_be32((void *)(CONFIG_SYS_FPGA_BASE + 0x0c), reg | BACKLIGHT_ENABLE); } else { -- 1.9.1

7 42

[U-Boot] [PATCH] common: env: remove superfluous assignment
by Heinrich Schuchardt 12 May '17

12 May '17

The value assigned to variable 'value' is never used. The problem was indicated by clang scan-build. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- cmd/nvedit.c | 1 - 1 file changed, 1 deletion(-) diff --git a/cmd/nvedit.c b/cmd/nvedit.c index 9ca5cb58a7..8f4e6bbe62 100644 --- a/cmd/nvedit.c +++ b/cmd/nvedit.c @@ -234,7 +234,6 @@ static int _do_env_set(int flag, int argc, char * const argv[], int env_flag) } debug("Final value for argc=%d\n", argc); name = argv[1]; - value = argv[2]; if (strchr(name, '=')) { printf("## Error: illegal character '='" -- 2.11.0

2 1

[U-Boot] [PATCH v3 0/2] Fix build with OpenSSL 1.1.x
by Jelle van der Waa 12 May '17

12 May '17

Sorry for the delay, this is the third series of the fix the build with OpenSSL 1.1.x while keeping compatibility with older OpenSSL versions. v3 fixes: - Add missing include <openssl/bn.h> - Loading the parameter e into key_n - #ifdef more deprecated functions which OpenSSL now handles internally. For some reason my compiler didn't warn me about them being deprecated. - Switch SSL_library_init() to OPENSSL_init_ssl(0, NULL). Jelle van der Waa (2): rsa: Fix build with OpenSSL 1.1.x tools: kwbimage fix build with OpenSSL 1.1.x lib/rsa/rsa-sign.c | 44 ++++++++++++++++++++++++++++++++++++++------ tools/kwbimage.c | 36 ++++++++++++++++++++++++++++++------ 2 files changed, 68 insertions(+), 12 deletions(-) -- 2.12.2

3 5

[U-Boot] [PATCH 1/1] net/arp: remove superfluous assignments
by Heinrich Schuchardt 12 May '17

12 May '17

The value of variable pkt is never used. The problem was indicated by clang scan-build. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- net/arp.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/net/arp.c b/net/arp.c index 824d2e9393..f3ceff9ed8 100644 --- a/net/arp.c +++ b/net/arp.c @@ -125,7 +125,6 @@ void arp_receive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len) { struct arp_hdr *arp; struct in_addr reply_ip_addr; - uchar *pkt; int eth_hdr_size; /* @@ -163,9 +162,7 @@ void arp_receive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len) case ARPOP_REQUEST: /* reply with our IP address */ debug_cond(DEBUG_DEV_PKT, "Got ARP REQUEST, return our IP\n"); - pkt = (uchar *)et; eth_hdr_size = net_update_ether(et, et->et_src, PROT_ARP); - pkt += eth_hdr_size; arp->ar_op = htons(ARPOP_REPLY); memcpy(&arp->ar_tha, &arp->ar_sha, ARP_HLEN); net_copy_ip(&arp->ar_tpa, &arp->ar_spa); -- 2.11.0

2 1

[U-Boot] [PATCH 1/1] lib/slre: remove superfluous assignment
by Heinrich Schuchardt 12 May '17

12 May '17

The value assigned to saved_offset is never used. The problem was indicated by clang scan-build. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/slre.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/slre.c b/lib/slre.c index f90749f8ed..e26d344865 100644 --- a/lib/slre.c +++ b/lib/slre.c @@ -441,7 +441,7 @@ loop_greedy(const struct slre *r, int pc, const char *s, int len, int *ofs) { int saved_offset, matched_offset; - saved_offset = matched_offset = *ofs; + matched_offset = *ofs; while (match(r, pc + 2, s, len, ofs, NULL)) { saved_offset = *ofs; -- 2.11.0

2 1

[U-Boot] [PATCH] pci: avoid memory leak
by Heinrich Schuchardt 12 May '17

12 May '17

strdup uses malloc to allocate memory for str. If we cannot bind to the generic driver we should release the memory. The problem was indicated by clang scan-build. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- drivers/pci/pci-uclass.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c index 40f59c0c4c..504d7e3bb1 100644 --- a/drivers/pci/pci-uclass.c +++ b/drivers/pci/pci-uclass.c @@ -660,6 +660,7 @@ static int pci_find_and_bind_driver(struct udevice *parent, ret = device_bind_driver(parent, drv, str, devp); if (ret) { debug("%s: Failed to bind generic driver: %d\n", __func__, ret); + free(str); return ret; } debug("%s: No match found: bound generic driver instead\n", __func__); -- 2.11.0

3 2

[U-Boot] [PATCH 1/1] env: avoid possible NULL pointer access
by Heinrich Schuchardt 12 May '17

12 May '17

env_attr_lookup call env_attr_walk with callback = regex_callback. In env_attr_walk attributes = strchr(entry_cpy, ENV_ATTR_SEP) will return NULL if ENV_ATTR_SEP is not found. In the aftermath regex_callback may call strlen(attributes) with a NULL value which will lead to a failure. The problem was indicated by scan-clam. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- common/env_attr.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/common/env_attr.c b/common/env_attr.c index 5bfe5e3a89..68843f2e0f 100644 --- a/common/env_attr.c +++ b/common/env_attr.c @@ -132,6 +132,10 @@ static int regex_callback(const char *name, const char *attributes, void *priv) if (slre_match(&slre, cbp->searched_for, strlen(cbp->searched_for), caps)) { free(cbp->regex); + if (!attributes) { + retval = -EINVAL; + goto done; + } cbp->regex = malloc(strlen(regex) + 1); if (cbp->regex) { strcpy(cbp->regex, regex); -- 2.11.0

2 1