Skip to contentSkip to conversation

cmd: nvedit: env_get_f must check for env_get_char error codes

PATCH In review Simon Goldschmidt 5 participants 10 messages Jan 31, 2018 – Feb 7, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cmd: nvedit: env_get_f must check for env_get_char error codes

env_get_f calls env_get_char to load single characters from the environment. However, the return value of env_get_char was not checked for errors. Now if the env driver does not support the .get_char call, env_get_f did not notice this and looped over the whole size of the environment, calling env_get_char over 8000 times with the default settings, just to return an error in the end.

Fix this by checking if env_get_char returns < 0.

---

 cmd/nvedit.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
cmd/nvedit.c +8 -3
index a690d743cd..4cb25b8248 100644
@@ -650,12 +650,14 @@ char *env_get(const char *name)
  */
 int env_get_f(const char *name, char *buf, unsigned len)
 {
-	int i, nxt;
+	int i, nxt, c;
 
 	for (i = 0; env_get_char(i) != '\0'; i = nxt + 1) {
 		int val, n;
 
-		for (nxt = i; env_get_char(nxt) != '\0'; ++nxt) {
+		for (nxt = i; (c = env_get_char(nxt)) != '\0'; ++nxt) {
+			if (c < 0)
+				return c;
 			if (nxt >= CONFIG_ENV_SIZE)
 				return -1;
 		}
@@ -666,7 +668,10 @@ int env_get_f(const char *name, char *buf, unsigned len)
 
 		/* found; copy out */
 		for (n = 0; n < len; ++n, ++buf) {
-			*buf = env_get_char(val++);
+			c = env_get_char(val++);
+			if (c < 0)
+				return c;
+			*buf = c;
 			if (*buf == '\0')
 				return n;
 		}
Signature · 15 lines
2.11.0


Pepperl+Fuchs GmbH, Mannheim
Geschaeftsfuehrer/Managing Directors: Dr.-Ing. Gunther Kegel (Vors./CEO), Werner Guthier, Mehmet Hatiboglu
Vorsitzender des Aufsichtsrats/Chairman of the supervisory board: Claus Michael
Registergericht/Register Court: AG Mannheim HRB 4713

Wichtiger Hinweis:
Diese E-Mail einschliesslich ihrer Anhaenge enthaelt vertrauliche und rechtlich geschuetzte Informationen, die nur fuer den Adressaten bestimmt sind. 
Sollten Sie nicht der bezeichnete Adressat sein, so teilen Sie dies bitte dem Absender umgehend mit und loeschen Sie diese Nachricht und ihre Anhaenge. Die unbefugte Weitergabe, das Anfertigen von Kopien und jede Veraenderung der E-Mail ist untersagt. Der Absender haftet nicht fuer Inhalte von veraenderten E-Mails.


Important Information:
This e-mail message including its attachments contains confidential and legally protected information solely intended for the addressee. If you are not the intended addressee of this message, please contact the addresser immediately and delete this message including its attachments. The unauthorized dissemination, copying and change of this e-mail are strictly forbidden. The addresser shall not be liable for the content of such changed e-mails.
#1 lore raw

PATCH 1/1 cmd: nvedit: env_get_f must check for env_get_char error codes

Quoted 11 lines · Simon Goldschmidt

env_get_f calls env_get_char to load single characters from the environment. However, the return value of env_get_char was not checked for errors. Now if the env driver does not support the .get_char call, env_get_f did not notice this and looped over the whole size of the environment, calling env_get_char over 8000 times with the default settings, just to return an error in the end.

Fix this by checking if env_get_char returns < 0.

Thanks!
Maxime

Signature · 10 lines
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180131/6b8fc307/attachment.sig>
#2 lore raw

PATCH 1/1 cmd: nvedit: env_get_f must check for env_get_char error codes

In reply to Simon Goldschmidt
Quoted 40 lines · Simon Goldschmidt

env_get_f calls env_get_char to load single characters from the environment. However, the return value of env_get_char was not checked for errors. Now if the env driver does not support the .get_char call, env_get_f did not notice this and looped over the whole size of the environment, calling env_get_char over 8000 times with the default settings, just to return an error in the end.

Fix this by checking if env_get_char returns < 0.

---

 cmd/nvedit.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
cmd/nvedit.c +4 -2
index a690d743cd..4cb25b8248 100644
@@ -650,12 +650,14 @@ char *env_get(const char *name)
  */
 int env_get_f(const char *name, char *buf, unsigned len)
 {
-	int i, nxt;
+	int i, nxt, c;
 
 	for (i = 0; env_get_char(i) != '\0'; i = nxt + 1) {
 		int val, n;
 
-		for (nxt = i; env_get_char(nxt) != '\0'; ++nxt) {
+		for (nxt = i; (c = env_get_char(nxt)) != '\0'; ++nxt) {
+			if (c < 0)
+				return c;
 			if (nxt >= CONFIG_ENV_SIZE)
 				return -1;
 		}
@@ -666,7 +668,10 @@ int env_get_f(const char *name, char *buf, unsigned len)
 

cmd/nvedit.c int env_get_f(const char *name, char *buf, unsigned len) · line 677

Quoted 10 lines
cmd/nvedit.c +4 -1
 		/* found; copy out */
 		for (n = 0; n < len; ++n, ++buf) {
-			*buf = env_get_char(val++);
+			c = env_get_char(val++);
+			if (c < 0)
+				return c;
+			*buf = c;
 			if (*buf == '\0')
 				return n;
 		}

Simon,

This patch looks correct. But it doesn't fix NOR flash. Do you have plan to add .get_char function to other drivers? Without that function, we cannot get env variables before relocation.

York

#3 lore raw

PATCH 1/1 cmd: nvedit: env_get_f must check for env_get_char error codes

Quoted 53 lines · York Sun
Quoted 40 lines · Simon Goldschmidt

env_get_f calls env_get_char to load single characters from the environment. However, the return value of env_get_char was not checked for errors. Now if the env driver does not support the .get_char call, env_get_f did not notice this and looped over the whole size of the environment, calling env_get_char over 8000 times with the default settings, just to return an error in the end.

Fix this by checking if env_get_char returns < 0.

---

  cmd/nvedit.c | 11 ++++++++---
  1 file changed, 8 insertions(+), 3 deletions(-)
cmd/nvedit.c +4 -2
index a690d743cd..4cb25b8248 100644
@@ -650,12 +650,14 @@ char *env_get(const char *name)
   */
  int env_get_f(const char *name, char *buf, unsigned len)
  {
-	int i, nxt;
+	int i, nxt, c;
 
  	for (i = 0; env_get_char(i) != '\0'; i = nxt + 1) {
  		int val, n;
 
-		for (nxt = i; env_get_char(nxt) != '\0'; ++nxt) {
+		for (nxt = i; (c = env_get_char(nxt)) != '\0'; ++nxt) {
+			if (c < 0)
+				return c;
  			if (nxt >= CONFIG_ENV_SIZE)
  				return -1;
  		}
@@ -666,7 +668,10 @@ int env_get_f(const char *name, char *buf, unsigned len)
 

cmd/nvedit.c int env_get_f(const char *name, char *buf, unsigned len) · line 677

Quoted 10 lines
cmd/nvedit.c +4 -1
  		/* found; copy out */
  		for (n = 0; n < len; ++n, ++buf) {
-			*buf = env_get_char(val++);
+			c = env_get_char(val++);
+			if (c < 0)
+				return c;
+			*buf = c;
  			if (*buf == '\0')
  				return n;
  		}

Simon,

Quoted 3 lines

This patch looks correct. But it doesn't fix NOR flash. Do you have plan to add .get_char function to other drivers? Without that function, we cannot get env variables before relocation.

Ehrm, sorry  I don't plan to do that, no: my target seems to run fine without this.

Given that only the eeprom and nvram env drivers support the get_char method, I don't know if this is widely used at all. Maybe a better fallback would be to just remove that get_char code path totally and always load from the internal (default) environment until the full environment is available (after relocation).

After all, the environment variables loaded via get_char are not CRC checked at all. To me, this is another indication that this code is not really useful and should probably be removed.

Maxime and others, what do you think?

Simon

#4 lore raw

PATCH 1/1 cmd: nvedit: env_get_f must check for env_get_char error codes

Hi Simon,

Quoted 64 lines · Simon Goldschmidt
Quoted 50 lines · York Sun
Quoted 37 lines · Simon Goldschmidt

env_get_f calls env_get_char to load single characters from the environment. However, the return value of env_get_char was not checked for errors. Now if the env driver does not support the .get_char call, env_get_f did not notice this and looped over the whole size of the environment, calling env_get_char over 8000 times with the default settings, just to return an error in the end.

Fix this by checking if env_get_char returns < 0.

---

  cmd/nvedit.c | 11 ++++++++---
  1 file changed, 8 insertions(+), 3 deletions(-)
cmd/nvedit.c +4 -2
index a690d743cd..4cb25b8248 100644
@@ -650,12 +650,14 @@ char *env_get(const char *name)
   */
  int env_get_f(const char *name, char *buf, unsigned len)
  {
-	int i, nxt;
+	int i, nxt, c;
  	for (i = 0; env_get_char(i) != '\0'; i = nxt + 1) {
  		int val, n;
-		for (nxt = i; env_get_char(nxt) != '\0'; ++nxt) {
+		for (nxt = i; (c = env_get_char(nxt)) != '\0'; ++nxt) {
+			if (c < 0)
+				return c;
  			if (nxt >= CONFIG_ENV_SIZE)
  				return -1;
  		}
@@ -666,7 +668,10 @@ int env_get_f(const char *name, char *buf, unsigned len)
  		/* found; copy out */

cmd/nvedit.c int env_get_f(const char *name, char *buf, unsigned len) · line 677

Quoted 10 lines
cmd/nvedit.c +4 -1
  		for (n = 0; n < len; ++n, ++buf) {
-			*buf = env_get_char(val++);
+			c = env_get_char(val++);
+			if (c < 0)
+				return c;
+			*buf = c;
  			if (*buf == '\0')
  				return n;
  		}
 

Simon,

Quoted 3 lines

This patch looks correct. But it doesn't fix NOR flash. Do you have plan to add .get_char function to other drivers? Without that function, we cannot get env variables before relocation.

Ehrm, sorry  I don't plan to do that, no: my target seems to run fine without this.

Given that only the eeprom and nvram env drivers support the get_char method, I don't know if this is widely used at all. Maybe a better fallback would be to just remove that get_char code path totally and always load from the internal (default) environment until the full environment is available (after relocation).

Quoted 3 lines

After all, the environment variables loaded via get_char are not CRC checked at all. To me, this is another indication that this code is not really useful and should probably be removed.

To be honest, I'm not really sure what get_char was here for in the first place, so getting rid of it sounds like a good idea :)

Maxime

Signature · 10 lines
Maxime Ripard, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
http://bootlin.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180202/a5f79941/attachment.sig>
#5 lore raw

PATCH 1/1 cmd: nvedit: env_get_f must check for env_get_char error codes

On 02/02/2018 10:51 AM, Maxime Ripard wrote:

<snip>

Quoted 16 lines
Quoted 16 lines
Quoted 6 lines
Quoted 1 line

Simon,

This patch looks correct. But it doesn't fix NOR flash. Do you have plan to add .get_char function to other drivers? Without that function, we cannot get env variables before relocation.

Ehrm, sorry  I don't plan to do that, no: my target seems to run fine without this.

Given that only the eeprom and nvram env drivers support the get_char method, I don't know if this is widely used at all. Maybe a better fallback would be to just remove that get_char code path totally and always load from the internal (default) environment until the full environment is available (after relocation).

Quoted 7 lines
Quoted 3 lines

After all, the environment variables loaded via get_char are not CRC checked at all. To me, this is another indication that this code is not really useful and should probably be removed.

To be honest, I'm not really sure what get_char was here for in the first place, so getting rid of it sounds like a good idea :)

On almost all my boards, a variable hwconfig is read before relocation to determine DDR configuration. This has been broken. I don't mind you remove some dead code. But this is breaking almost all my boards booting from NOR flash.

York

#6 lore raw

PATCH 1/1 cmd: nvedit: env_get_f must check for env_get_char error codes

Hi York,

Quoted 18 lines · York Sun
Quoted 17 lines · Maxime Ripard
Quoted 16 lines
Quoted 3 lines

This patch looks correct. But it doesn't fix NOR flash. Do you have plan to add .get_char function to other drivers? Without that function, we cannot get env variables before relocation.

Ehrm, sorry  I don't plan to do that, no: my target seems to run fine without this.

Given that only the eeprom and nvram env drivers support the get_char method, I don't know if this is widely used at all. Maybe a better fallback would be to just remove that get_char code path totally and always load from the internal (default) environment until the full environment is available (after relocation).

After all, the environment variables loaded via get_char are not CRC checked at all. To me, this is another indication that this code is not really useful and should probably be removed.

Quoted 7 lines
Quoted 2 lines

To be honest, I'm not really sure what get_char was here for in the first place, so getting rid of it sounds like a good idea :)

On almost all my boards, a variable hwconfig is read before relocation to determine DDR configuration. This has been broken. I don't mind you remove some dead code. But this is breaking almost all my boards booting from NOR flash.

Sorry if it fell through the cracks, I don't have a board with NOR myself. Do you know what breaks exactly?

Or can you bisect at least?

Thanks!
Maxime

Signature · 10 lines
Maxime Ripard, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
http://bootlin.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180205/411347de/attachment.sig>
#7 lore raw

PATCH 1/1 cmd: nvedit: env_get_f must check for env_get_char error codes

Quoted 29 lines · Maxime Ripard

Hi York,

Quoted 18 lines · York Sun
Quoted 17 lines · Maxime Ripard
Quoted 16 lines
Quoted 3 lines

This patch looks correct. But it doesn't fix NOR flash. Do you have plan to add .get_char function to other drivers? Without that function, we cannot get env variables before relocation.

Ehrm, sorry  I don't plan to do that, no: my target seems to run fine without this.

Given that only the eeprom and nvram env drivers support the get_char method, I don't know if this is widely used at all. Maybe a better fallback would be to just remove that get_char code path totally and always load from the internal (default) environment until the full environment is available (after relocation).

After all, the environment variables loaded via get_char are not CRC checked at all. To me, this is another indication that this code is not really useful and should probably be removed.

Quoted 7 lines
Quoted 2 lines

To be honest, I'm not really sure what get_char was here for in the first place, so getting rid of it sounds like a good idea :)

On almost all my boards, a variable hwconfig is read before relocation to determine DDR configuration. This has been broken. I don't mind you remove some dead code. But this is breaking almost all my boards booting from NOR flash.

Quoted 5 lines

Sorry if it fell through the cracks, I don't have a board with NOR myself. Do you know what breaks exactly?

Or can you bisect at least?

Yes, I did. It was the #3 patch in the series of "env: Multiple env support and env transition for sunxi". I reported in the email thread "Re: [U-Boot] [PATCH v3 09/15] env: Support multiple environments", along with another problem found regarding variable "env_load_location". The latter problem breaks saveenv on NOR flash.

York

#8 lore raw

PATCH 1/1 cmd: nvedit: env_get_f must check for env_get_char error codes

Quoted 33 lines · York Sun
Quoted 32 lines · Maxime Ripard

Hi York,

Quoted 18 lines · York Sun
Quoted 17 lines · Maxime Ripard
Quoted 16 lines
Quoted 3 lines

This patch looks correct. But it doesn't fix NOR flash. Do you have plan to add .get_char function to other drivers? Without that function, we cannot get env variables before relocation.

Ehrm, sorry  I don't plan to do that, no: my target seems to run fine without this.

Given that only the eeprom and nvram env drivers support the get_char method, I don't know if this is widely used at all. Maybe a better fallback would be to just remove that get_char code path totally and always load from the internal (default) environment until the full environment is available (after relocation).

After all, the environment variables loaded via get_char are not CRC checked at all. To me, this is another indication that this code is not really useful and should probably be removed.

Quoted 7 lines
Quoted 2 lines

To be honest, I'm not really sure what get_char was here for in the first place, so getting rid of it sounds like a good idea :)

On almost all my boards, a variable hwconfig is read before relocation to determine DDR configuration. This has been broken. I don't mind you remove some dead code. But this is breaking almost all my boards booting from NOR flash.

Sorry if it fell through the cracks, I don't have a board with NOR myself. Do you know what breaks exactly?

Quoted 7 lines
Quoted 1 line

Or can you bisect at least?

Yes, I did. It was the #3 patch in the series of "env: Multiple env support and env transition for sunxi". I reported in the email thread "Re: [U-Boot] [PATCH v3 09/15] env: Support multiple environments", along with another problem found regarding variable "env_load_location". The latter problem breaks saveenv on NOR flash.

Ah, right, I overlooked it, sorry.

I'll reply there.

Thanks!
Maxime

Signature · 10 lines
Maxime Ripard, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
http://bootlin.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180207/08f1b11d/attachment.sig>
#9 lore raw
In reply to Simon Goldschmidt
Quoted 8 lines · Simon Goldschmidt

env_get_f calls env_get_char to load single characters from the environment. However, the return value of env_get_char was not checked for errors. Now if the env driver does not support the .get_char call, env_get_f did not notice this and looped over the whole size of the environment, calling env_get_char over 8000 times with the default settings, just to return an error in the end.

Quoted 4 lines

Fix this by checking if env_get_char returns < 0.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180201/5c07424e/attachment.sig>