From patchwork Sun Aug 23 20:37:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1350024 X-Patchwork-Delegate: freifunk@adrianschmutzler.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=adrianschmutzler.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=MJQ2JOKs; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BZRwv1CRtz9sTK for ; Mon, 24 Aug 2020 06:41:02 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=r4f5p/0VlDUU3VRFvM4CDqqAWcB+UFaam+5sIIIFl7s=; b=MJQ2JOKsFF4vQO410xKYmHo+4 YSSvNxHc58RTuMZOEOQxXg0i/iSj1d5VWWwlC7krhpLx9j9Lk/nXJgYwgyiKyyd5w0ozRP9wiMig/ yt0zoS9M2SPi40rOjX/UgTj8diZujoKbmI8fr+od0vAEwgxSweAjJiGStdXP6twVJiztQo70Mvvod tkhdRleM7HGOstScg14Z+1/sywM70Z4DjAHHvxAVMuI2HTN7hGtnlx2s4W9aZ09mqeoQN3JQ+r7kS YE2JUXyEXNtWenNNlSY58zR53dsI25aMxp7LgQXcqVq4bn4En2i6itIgq9/jhLSDr6KJ+q3atwS8i D2kM6C67g==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k9wlu-0007xo-0v; Sun, 23 Aug 2020 20:39:22 +0000 Received: from mout.kundenserver.de ([212.227.17.24]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k9wlP-0007rk-Iz for openwrt-devel@lists.openwrt.org; Sun, 23 Aug 2020 20:39:09 +0000 Received: from buildfff.adridolf.com ([188.192.134.246]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1Mc0Er-1km2b244Ap-00dX0k; Sun, 23 Aug 2020 22:38:40 +0200 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH v2 3/8] uboot-at91: bump version to linux4sam-2020.04 Date: Sun, 23 Aug 2020 22:37:35 +0200 Message-Id: <20200823203740.56789-3-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200823203740.56789-1-freifunk@adrianschmutzler.de> References: <20200823203740.56789-1-freifunk@adrianschmutzler.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:qAOqCffMlT9hulfRBAjQpiq6PpsNOlXEAscKZa0B88do/T4rHqO 9OsL/WEJF/u1TwYzh5OAHHvt/n9NosUvknm9dwuMQ2bHVDavFjT2PuBpC9gfH9/AhiUOVGs b0uxpygm+zE+yOGynQ3eeTHJ99EXAK1kCqDjXNFiG22BDJ2osaTDSlLXWQf9Y3/VIGTbQFi uWLHY+SLY1GbG7ZB+JvSA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:pHn3RyAj7Io=:oZXgtHzRCAhFNp7aKYcOGD czyRDu5JC8PlNAD8i/uVZzs+N/MoVLdMFaLkFtSiO5qga/l2IHfBJsL5/n7A3EYLo5uTAQtSn X3pdYk9r0O9+oiYSb0Sm3Xr91aDOYElOlfuewTTLQrpdKI4+EGAghJw66ECvHiI64QD7HXaMp BKBxxJNYsn0i30MeCa+lXE05YKv0tev8pP13yDQ3pfG5qTMrv3Aau1y1GtDG1vJ82+CbeL4BD hLjoZTy1+I1mkyyg9cAt/YctaoZXbV3A8yPyKCr1t3NBSUuwEQRttBdHcydnQiqJI/2lI0+Lr Pu4xG5YEvtDsetYuQw+pQFpsj1QamsKJwIFrd4C8+n9KfahA9RTs7kp6jSIBnVil0z92giaTc zM84Iz0l+ZSqjH6mDJAMvQGjeGrhblu+jRaAm2buuQUB3KHXVd7MuoZLuQ0eJNuHrKIDvihBu T5s729NgougmSAo2apQFN7ojNuZUimEJmP7/M3x1B7UZBI1bdqhEg2Lh23NtipobsL0zlBa+S hseZANbMiIvZShnDK9Tq4sxYdUJIEpWdM7cXLOwXLVcZT+3X/JbWGgdxXRrP6lE+aS4SmNNzE TQTlsuRKk9s3BLV76QBzlUEWjDxdgkaaEiWQNOj3TcWFjKIxA5sTL3q7uPWqb+i+RkcYyXSph K8sgwtrSF0TIAYcTzzJCxHVJrwqP1aY4oXO5P4cSWB6liqiBUxOw0L3bkCmjH4l4NzyIS0QKG 2RJRIMZjp48z6Wt0BUF5X7Z7xwwQknLD+0DQuiyn2AHCwlBKyMKNgCfCCI7XrNFWTzuG9vCo4 1QyyyGMvQ057yOmmFcH+mr2mYTEz7VWiIKkuRUqsqFPng7e6wZMyz5qIIwwUa08DH/MIxkbPI jxKTnSC6EoL64t6m9LWA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200823_163852_614923_33A0D06B X-CRM114-Status: GOOD ( 13.71 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.17.24 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [212.227.17.24 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: sandeep.sheriker@microchip.com Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Sandeep Sheriker M Bump version to linux4sam-2020.04 and add patch to fix Wformat-security warnings. Signed-off-by: Sandeep Sheriker M --- package/boot/uboot-at91/Makefile | 4 +-- .../patches/001-fix-Wformat-security.patch | 34 ++++++++++++++++--- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/package/boot/uboot-at91/Makefile b/package/boot/uboot-at91/Makefile index 547b72f8d9..1fb32d4a89 100644 --- a/package/boot/uboot-at91/Makefile +++ b/package/boot/uboot-at91/Makefile @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=linux4sam_6.0 +PKG_VERSION:=linux4sam-2020.04 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/linux4sam/u-boot-at91.git -PKG_SOURCE_VERSION:=1e7d2e5973c1fb780e55e28a801c6c574158ac14 +PKG_SOURCE_VERSION:=0e1d1b6efb7f8e27c372279a906fcd2524df09da include $(INCLUDE_DIR)/u-boot.mk include $(INCLUDE_DIR)/package.mk diff --git a/package/boot/uboot-at91/patches/001-fix-Wformat-security.patch b/package/boot/uboot-at91/patches/001-fix-Wformat-security.patch index 18f9af742c..23cb5828b3 100644 --- a/package/boot/uboot-at91/patches/001-fix-Wformat-security.patch +++ b/package/boot/uboot-at91/patches/001-fix-Wformat-security.patch @@ -1,13 +1,39 @@ diff --git a/cmd/version.c b/cmd/version.c -index b2fffe9..bcbbeb1 100644 +index b2fffe99..bcbbeb18 100644 --- a/cmd/version.c +++ b/cmd/version.c @@ -18,7 +18,7 @@ static int do_version(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { - char buf[DISPLAY_OPTIONS_BANNER_LENGTH]; - + char buf[DISPLAY_OPTIONS_BANNER_LENGTH]; + - printf(display_options_get_banner(false, buf, sizeof(buf))); + printf("%s",display_options_get_banner(false, buf, sizeof(buf))); #ifdef CC_VERSION_STRING - puts(CC_VERSION_STRING "\n"); + puts(CC_VERSION_STRING "\n"); #endif +diff --git a/drivers/pinctrl/pinctrl-uclass.c b/drivers/pinctrl/pinctrl-uclass.c +index 3425ed11..8c2e1d5c 100644 +--- a/drivers/pinctrl/pinctrl-uclass.c ++++ b/drivers/pinctrl/pinctrl-uclass.c +@@ -368,7 +368,7 @@ int pinctrl_get_pin_name(struct udevice *dev, int selector, char *buf, + if (!ops->get_pin_name) + return -ENOSYS; + +- snprintf(buf, size, ops->get_pin_name(dev, selector)); ++ snprintf(buf, size, "%s", ops->get_pin_name(dev, selector)); + + return 0; + } +diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c +index c316bdfe..5fe8129c 100644 +--- a/lib/efi_loader/efi_variable.c ++++ b/lib/efi_loader/efi_variable.c +@@ -522,7 +522,7 @@ efi_status_t EFIAPI efi_set_variable(u16 *variable_name, + + if (old_size) + /* APPEND_WRITE */ +- s += sprintf(s, old_val); ++ s += sprintf(s, "%s", old_val); + else + s += sprintf(s, "(blob)"); +