From nobody Mon May 6 03:56:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520896237509558.0958109369464; Mon, 12 Mar 2018 16:10:37 -0700 (PDT) Received: from localhost ([::1]:36102 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evWaS-0001sx-Q6 for importer@patchew.org; Mon, 12 Mar 2018 19:10:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44529) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evVDQ-0002bb-NQ for qemu-devel@nongnu.org; Mon, 12 Mar 2018 17:42:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evVDM-0004Z9-Sm for qemu-devel@nongnu.org; Mon, 12 Mar 2018 17:42:44 -0400 Received: from sauhun.de ([88.99.104.3]:53438 helo=pokefinder.org) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evVDM-0004YX-Hy for qemu-devel@nongnu.org; Mon, 12 Mar 2018 17:42:40 -0400 Received: from localhost (x5ce5a6c8.dyn.telefonica.de [92.229.166.200]) by pokefinder.org (Postfix) with ESMTPSA id EFAA02C3599; Mon, 12 Mar 2018 22:42:38 +0100 (CET) From: Wolfram Sang To: qemu-devel@nongnu.org Date: Mon, 12 Mar 2018 22:42:28 +0100 Message-Id: <20180312214230.17561-2-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180312214230.17561-1-wsa+renesas@sang-engineering.com> References: <20180312214230.17561-1-wsa+renesas@sang-engineering.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 88.99.104.3 X-Mailman-Approved-At: Mon, 12 Mar 2018 19:05:45 -0400 Subject: [Qemu-devel] [PATCH 1/3] nvram: at24c: remove doubled prefix for ERR X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-renesas-soc@vger.kernel.org, Wolfram Sang , Michael Davidsaver Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The ERR macro already has the TYPE_AT24C_EE prefix, no need to repeat in the error message. Signed-off-by: Wolfram Sang --- hw/nvram/eeprom_at24c.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/hw/nvram/eeprom_at24c.c b/hw/nvram/eeprom_at24c.c index 5494351976..8507516b7e 100644 --- a/hw/nvram/eeprom_at24c.c +++ b/hw/nvram/eeprom_at24c.c @@ -60,8 +60,7 @@ int at24c_eeprom_event(I2CSlave *s, enum i2c_event event) if (ee->blk && ee->changed) { int len =3D blk_pwrite(ee->blk, 0, ee->mem, ee->rsize, 0); if (len !=3D ee->rsize) { - ERR(TYPE_AT24C_EE - " : failed to write backing file\n"); + ERR("failed to write backing file\n"); } DPRINTK("Wrote to backing file\n"); } @@ -127,7 +126,7 @@ int at24c_eeprom_init(I2CSlave *i2c) int64_t len =3D blk_getlength(ee->blk); =20 if (len !=3D ee->rsize) { - ERR(TYPE_AT24C_EE " : Backing file size %lu !=3D %u\n", + ERR("Backing file size %lu !=3D %u\n", (unsigned long)len, (unsigned)ee->rsize); exit(1); } @@ -135,8 +134,7 @@ int at24c_eeprom_init(I2CSlave *i2c) if (blk_set_perm(ee->blk, BLK_PERM_CONSISTENT_READ | BLK_PERM_WRIT= E, BLK_PERM_ALL, &error_fatal) < 0) { - ERR(TYPE_AT24C_EE - " : Backing file incorrect permission\n"); + ERR("Backing file incorrect permission\n"); exit(1); } } @@ -158,8 +156,7 @@ void at24c_eeprom_reset(DeviceState *state) int len =3D blk_pread(ee->blk, 0, ee->mem, ee->rsize); =20 if (len !=3D ee->rsize) { - ERR(TYPE_AT24C_EE - " : Failed initial sync with backing file\n"); + ERR("Failed initial sync with backing file\n"); } DPRINTK("Reset read backing file\n"); } --=20 2.11.0 From nobody Mon May 6 03:56:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520896182976709.4442727205159; Mon, 12 Mar 2018 16:09:42 -0700 (PDT) Received: from localhost ([::1]:36094 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evWZO-0001As-E2 for importer@patchew.org; Mon, 12 Mar 2018 19:09:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44528) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evVDQ-0002ba-NF for qemu-devel@nongnu.org; Mon, 12 Mar 2018 17:42:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evVDN-0004ZS-I0 for qemu-devel@nongnu.org; Mon, 12 Mar 2018 17:42:44 -0400 Received: from sauhun.de ([88.99.104.3]:53441 helo=pokefinder.org) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evVDN-0004Yd-BV for qemu-devel@nongnu.org; Mon, 12 Mar 2018 17:42:41 -0400 Received: from localhost (x5ce5a6c8.dyn.telefonica.de [92.229.166.200]) by pokefinder.org (Postfix) with ESMTPSA id 888EA2C35C6; Mon, 12 Mar 2018 22:42:39 +0100 (CET) From: Wolfram Sang To: qemu-devel@nongnu.org Date: Mon, 12 Mar 2018 22:42:29 +0100 Message-Id: <20180312214230.17561-3-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180312214230.17561-1-wsa+renesas@sang-engineering.com> References: <20180312214230.17561-1-wsa+renesas@sang-engineering.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 88.99.104.3 X-Mailman-Approved-At: Mon, 12 Mar 2018 19:05:45 -0400 Subject: [Qemu-devel] [PATCH 2/3] nvram: at24c: prevent segfault by checking "rom-size" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-renesas-soc@vger.kernel.org, Wolfram Sang , Michael Davidsaver Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The value for "rom-size" is used as a divisor, so it must not be 0 or it will segfault. A size of 0 wouldn't make sense as well. Signed-off-by: Wolfram Sang --- hw/nvram/eeprom_at24c.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/nvram/eeprom_at24c.c b/hw/nvram/eeprom_at24c.c index 8507516b7e..d82710e1df 100644 --- a/hw/nvram/eeprom_at24c.c +++ b/hw/nvram/eeprom_at24c.c @@ -120,6 +120,11 @@ int at24c_eeprom_init(I2CSlave *i2c) { EEPROMState *ee =3D AT24C_EE(i2c); =20 + if (!ee->rsize) { + ERR("rom-size not allowed to be 0\n"); + exit(1); + } + ee->mem =3D g_malloc0(ee->rsize); =20 if (ee->blk) { --=20 2.11.0 From nobody Mon May 6 03:56:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520896042817839.1934553540468; Mon, 12 Mar 2018 16:07:22 -0700 (PDT) Received: from localhost ([::1]:36084 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evWXK-0007tI-2x for importer@patchew.org; Mon, 12 Mar 2018 19:07:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44526) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evVDQ-0002bY-MA for qemu-devel@nongnu.org; Mon, 12 Mar 2018 17:42:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evVDM-0004ZG-Um for qemu-devel@nongnu.org; Mon, 12 Mar 2018 17:42:44 -0400 Received: from sauhun.de ([88.99.104.3]:53449 helo=pokefinder.org) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evVDM-0004Yv-OI for qemu-devel@nongnu.org; Mon, 12 Mar 2018 17:42:40 -0400 Received: from localhost (x5ce5a6c8.dyn.telefonica.de [92.229.166.200]) by pokefinder.org (Postfix) with ESMTPSA id 201412C35CA; Mon, 12 Mar 2018 22:42:40 +0100 (CET) From: Wolfram Sang To: qemu-devel@nongnu.org Date: Mon, 12 Mar 2018 22:42:30 +0100 Message-Id: <20180312214230.17561-4-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180312214230.17561-1-wsa+renesas@sang-engineering.com> References: <20180312214230.17561-1-wsa+renesas@sang-engineering.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 88.99.104.3 X-Mailman-Approved-At: Mon, 12 Mar 2018 19:05:45 -0400 Subject: [Qemu-devel] [PATCH 3/3] nvram: at24c: use a sane default for "rom-size" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-renesas-soc@vger.kernel.org, Wolfram Sang , Michael Davidsaver Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 0 as "rom-size" doesn't make much sense, let's use the smallest 24cXX which has 128 byte. Signed-off-by: Wolfram Sang Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/nvram/eeprom_at24c.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/nvram/eeprom_at24c.c b/hw/nvram/eeprom_at24c.c index d82710e1df..de988f8d07 100644 --- a/hw/nvram/eeprom_at24c.c +++ b/hw/nvram/eeprom_at24c.c @@ -168,7 +168,7 @@ void at24c_eeprom_reset(DeviceState *state) } =20 static Property at24c_eeprom_props[] =3D { - DEFINE_PROP_UINT32("rom-size", EEPROMState, rsize, 0), + DEFINE_PROP_UINT32("rom-size", EEPROMState, rsize, 128), DEFINE_PROP_BOOL("writable", EEPROMState, writable, true), DEFINE_PROP_DRIVE("drive", EEPROMState, blk), DEFINE_PROP_END_OF_LIST() --=20 2.11.0