Revert "env: Warn on force access if ENV_ACCESS_IGNORE_FORCE set"
PATCH 1/1 Revert "env: Warn on force access if ENV_ACCESS_IGNORE_FORCE set"
This reverts commit 0f036bf4b87e6416f5c4d23865a62a62d9073c20.
With this change applied and CONFIG_ENV_ACCESS_IGNORE_FORCE disabled, the warning appears on every force overwrite, but the variable is then written to:
=> env print ethaddr
ethaddr=00:1C:2B:08:AF:65
=> env set ethaddr 00:00:00:00:00:00
## Error: Can't overwrite "ethaddr"
## Error inserting "ethaddr" variable, errno=1
=> env print ethaddr
ethaddr=00:1C:2B:08:AF:65
=> env set -f ethaddr 00:00:00:00:00:00
## Error: Can't force access to "ethaddr"
=> env print ethaddr
ethaddr=00:00:00:00:00:00
---
As I noted in my email, I can't see an immediately obvious way to make this work as intended and given we're at -rc3, I think a revert is the most appropriate way forward.
env/flags.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
env/flags.c +1 -3
@@ -564,10 +564,8 @@ int env_flags_validate(const struct env_entry *item, const char *newval,#endif #ifndef CONFIG_ENV_ACCESS_IGNORE_FORCE -if (flag &H_FORCE ) { -printf ("## Error: Can't force access to \"%s\"\n" , name); +if (flag &H_FORCE )return 0 ; - }#endif switch (op) {case env_op_delete:
Signature · 1 line
2.17.1
PATCH 1/1 Revert "env: Warn on force access if ENV_ACCESS_IGNORE_FORCE set"
Quoted 18 lines · Alex Kiernan
This reverts commit
0f036bf4b87e6416f5c4d23865a62a62d9073c20.With this change applied and
CONFIG_ENV_ACCESS_IGNORE_FORCEdisabled, the warning appears on every force overwrite, but the variable is then written to:=> env print ethaddr
ethaddr=00:1C:2B:08:AF:65
=> env set ethaddr 00:00:00:00:00:00
## Error: Can't overwrite "ethaddr"
## Error inserting "ethaddr" variable, errno=1
=> env print ethaddr
ethaddr=00:1C:2B:08:AF:65
=> env set -f ethaddr 00:00:00:00:00:00
## Error: Can't force access to "ethaddr"
=> env print ethaddr
ethaddr=00:00:00:00:00:00
Quoted 5 lines
Signed-off-by Alex Kiernan <[email protected]>---
As I noted in my email, I can't see an immediately obvious way to make this work as intended and given we're at -rc3, I think a revert is the most appropriate way forward.
Can you please spend some more time on proper fix, instead of just reverting ? Reverting isn't the way forward most of the time.
PATCH 1/1 Revert "env: Warn on force access if ENV_ACCESS_IGNORE_FORCE set"
Quoted 19 lines · Marek Vasut
Quoted 18 lines · Alex Kiernan
This reverts commit
0f036bf4b87e6416f5c4d23865a62a62d9073c20.With this change applied and
CONFIG_ENV_ACCESS_IGNORE_FORCEdisabled, the warning appears on every force overwrite, but the variable is then written to:=> env print ethaddr
ethaddr=00:1C:2B:08:AF:65
=> env set ethaddr 00:00:00:00:00:00
## Error: Can't overwrite "ethaddr"
## Error inserting "ethaddr" variable, errno=1
=> env print ethaddr
ethaddr=00:1C:2B:08:AF:65
=> env set -f ethaddr 00:00:00:00:00:00
## Error: Can't force access to "ethaddr"
=> env print ethaddr
ethaddr=00:00:00:00:00:00
Quoted 8 lines
Quoted 5 lines
Signed-off-by Alex Kiernan <[email protected]>---
As I noted in my email, I can't see an immediately obvious way to make this work as intended and given we're at -rc3, I think a revert is the most appropriate way forward.Can you please spend some more time on proper fix, instead of just reverting ? Reverting isn't the way forward most of the time.
Can you assist in that? So far the original patch broke the EFI tests, but Heinrich and I came up with a compromise (but it's also I suspect that Alex saw). It is probably better to go back to the same behavior as the last release and try again next release once the problem can be addressed by someone.
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200827/92d6e52d/attachment.sig>
PATCH 1/1 Revert "env: Warn on force access if ENV_ACCESS_IGNORE_FORCE set"
Quoted 27 lines · Tom Rini
Quoted 25 lines · Marek Vasut
Quoted 23 lines · Alex Kiernan
This reverts commit
0f036bf4b87e6416f5c4d23865a62a62d9073c20.With this change applied and
CONFIG_ENV_ACCESS_IGNORE_FORCEdisabled, the warning appears on every force overwrite, but the variable is then written to:=> env print ethaddr
ethaddr=00:1C:2B:08:AF:65
=> env set ethaddr 00:00:00:00:00:00
## Error: Can't overwrite "ethaddr"
## Error inserting "ethaddr" variable, errno=1
=> env print ethaddr
ethaddr=00:1C:2B:08:AF:65
=> env set -f ethaddr 00:00:00:00:00:00
## Error: Can't force access to "ethaddr"
=> env print ethaddr
ethaddr=00:00:00:00:00:00Signed-off-by Alex Kiernan <[email protected]>---
As I noted in my email, I can't see an immediately obvious way to make this work as intended and given we're at -rc3, I think a revert is the most appropriate way forward.
Quoted 9 lines
Quoted 2 lines
Can you please spend some more time on proper fix, instead of just reverting ? Reverting isn't the way forward most of the time.
Can you assist in that? So far the original patch broke the EFI tests, but Heinrich and I came up with a compromise (but it's also I suspect that Alex saw). It is probably better to go back to the same behavior as the last release and try again next release once the problem can be addressed by someone.
I had another play with it and think I have something that'll work, though I leave my current job at the end of the week, so if it's not right I'm unlikely to be able to fix it.
That said, I think there's something which has changed because I now need force in order to set things like ethaddr in a boot script (where it's already been set in the board code) whereas I didn't before.
Signature · 1 line
Alex Kiernan
PATCH 1/1 Revert "env: Warn on force access if ENV_ACCESS_IGNORE_FORCE set"
Quoted 39 lines · Alex Kiernan
Quoted 27 lines · Tom Rini
Quoted 25 lines · Marek Vasut
Quoted 23 lines · Alex Kiernan
This reverts commit
0f036bf4b87e6416f5c4d23865a62a62d9073c20.With this change applied and
CONFIG_ENV_ACCESS_IGNORE_FORCEdisabled, the warning appears on every force overwrite, but the variable is then written to:=> env print ethaddr
ethaddr=00:1C:2B:08:AF:65
=> env set ethaddr 00:00:00:00:00:00
## Error: Can't overwrite "ethaddr"
## Error inserting "ethaddr" variable, errno=1
=> env print ethaddr
ethaddr=00:1C:2B:08:AF:65
=> env set -f ethaddr 00:00:00:00:00:00
## Error: Can't force access to "ethaddr"
=> env print ethaddr
ethaddr=00:00:00:00:00:00Signed-off-by Alex Kiernan <[email protected]>---
As I noted in my email, I can't see an immediately obvious way to make this work as intended and given we're at -rc3, I think a revert is the most appropriate way forward.Quoted 9 lines
Quoted 2 lines
Can you please spend some more time on proper fix, instead of just reverting ? Reverting isn't the way forward most of the time.
Can you assist in that? So far the original patch broke the EFI tests, but Heinrich and I came up with a compromise (but it's also I suspect that Alex saw). It is probably better to go back to the same behavior as the last release and try again next release once the problem can be addressed by someone.
Quoted 4 lines
I had another play with it and think I have something that'll work, though I leave my current job at the end of the week, so if it's not right I'm unlikely to be able to fix it.
Sorry, I ran out of time... so it's highly unlikely I'll get to look at this any time soon. Unfortunately I don't have access to that tree anymore either.
Signature · 1 line
Alex Kiernan
PATCH 1/1 Revert "env: Warn on force access if ENV_ACCESS_IGNORE_FORCE set"
Quoted 40 lines · Alex Kiernan
Quoted 39 lines · Alex Kiernan
Quoted 36 lines · Tom Rini
Quoted 19 lines · Marek Vasut
Quoted 18 lines · Alex Kiernan
This reverts commit
0f036bf4b87e6416f5c4d23865a62a62d9073c20.With this change applied and
CONFIG_ENV_ACCESS_IGNORE_FORCEdisabled, the warning appears on every force overwrite, but the variable is then written to:=> env print ethaddr
ethaddr=00:1C:2B:08:AF:65
=> env set ethaddr 00:00:00:00:00:00
## Error: Can't overwrite "ethaddr"
## Error inserting "ethaddr" variable, errno=1
=> env print ethaddr
ethaddr=00:1C:2B:08:AF:65
=> env set -f ethaddr 00:00:00:00:00:00
## Error: Can't force access to "ethaddr"
=> env print ethaddr
ethaddr=00:00:00:00:00:00Quoted 8 lines
Quoted 5 lines
Signed-off-by Alex Kiernan <[email protected]>---
As I noted in my email, I can't see an immediately obvious way to make this work as intended and given we're at -rc3, I think a revert is the most appropriate way forward.Can you please spend some more time on proper fix, instead of just reverting ? Reverting isn't the way forward most of the time.
Can you assist in that? So far the original patch broke the EFI tests, but Heinrich and I came up with a compromise (but it's also I suspect that Alex saw). It is probably better to go back to the same behavior as the last release and try again next release once the problem can be addressed by someone.
Quoted 8 lines
Quoted 4 lines
I had another play with it and think I have something that'll work, though I leave my current job at the end of the week, so if it's not right I'm unlikely to be able to fix it.
Sorry, I ran out of time... so it's highly unlikely I'll get to look at this any time soon. Unfortunately I don't have access to that tree anymore either.
OK, so that means the work is now pushed on me. I will try to schedule this in the near future, because currently I am highly overloaded. Can you please at least share some information on what the approach you took was ?
PATCH 1/1 Revert "env: Warn on force access if ENV_ACCESS_IGNORE_FORCE set"
Quoted 47 lines · Marek Vasut
Quoted 45 lines · Alex Kiernan
Quoted 43 lines · Alex Kiernan
Quoted 27 lines · Tom Rini
Quoted 25 lines · Marek Vasut
Quoted 23 lines · Alex Kiernan
This reverts commit
0f036bf4b87e6416f5c4d23865a62a62d9073c20.With this change applied and
CONFIG_ENV_ACCESS_IGNORE_FORCEdisabled, the warning appears on every force overwrite, but the variable is then written to:=> env print ethaddr
ethaddr=00:1C:2B:08:AF:65
=> env set ethaddr 00:00:00:00:00:00
## Error: Can't overwrite "ethaddr"
## Error inserting "ethaddr" variable, errno=1
=> env print ethaddr
ethaddr=00:1C:2B:08:AF:65
=> env set -f ethaddr 00:00:00:00:00:00
## Error: Can't force access to "ethaddr"
=> env print ethaddr
ethaddr=00:00:00:00:00:00Signed-off-by Alex Kiernan <[email protected]>---
As I noted in my email, I can't see an immediately obvious way to make this work as intended and given we're at -rc3, I think a revert is the most appropriate way forward.Quoted 9 lines
Quoted 2 lines
Can you please spend some more time on proper fix, instead of just reverting ? Reverting isn't the way forward most of the time.
Can you assist in that? So far the original patch broke the EFI tests, but Heinrich and I came up with a compromise (but it's also I suspect that Alex saw). It is probably better to go back to the same behavior as the last release and try again next release once the problem can be addressed by someone.
I had another play with it and think I have something that'll work, though I leave my current job at the end of the week, so if it's not right I'm unlikely to be able to fix it.
Quoted 8 lines
Quoted 3 lines
Sorry, I ran out of time... so it's highly unlikely I'll get to look at this any time soon. Unfortunately I don't have access to that tree anymore either.
OK, so that means the work is now pushed on me. I will try to schedule this in the near future, because currently I am highly overloaded. Can you please at least share some information on what the approach you took was ?
Sure, it was something like this, completely untested though (and pasting into gmail seems to insist on eating tabs):
env/flags.c +0 -0
@@ -527,6 +527,7 @@ int env_flags_validate(const struct env_entry
*item, const char *newval,
{
const char *name;
const char *oldval = NULL;
+ bool ok;
if (op != env_op_create)
oldval = item->data;
@@ -563,23 +564,21 @@ int env_flags_validate(const struct env_entry *item, const char *newval,
return 1;
#endif
-#ifndef CONFIG_ENV_ACCESS_IGNORE_FORCE
- if (flag & H_FORCE) {
- printf("## Error: Can't force access to \"%s\"\n", name);
+ if (!CONFIG_IS_ENABLED(ENV_ACCESS_IGNORE_FORCE) && (flag & H_FORCE)) return 0;
- }
-#endif
+
+ ok = true;
switch (op) {
case env_op_delete:
if (item->flags & ENV_FLAGS_VARACCESS_PREVENT_DELETE) { printf("## Error: Can't delete \"%s\"\n", name);
- return 1;
+ ok = false;
}
break;
case env_op_overwrite:
if (item->flags & ENV_FLAGS_VARACCESS_PREVENT_OVERWR) { printf("## Error: Can't overwrite \"%s\"\n", name);
- return 1;
+ ok = false;
} else if (item->flags &
ENV_FLAGS_VARACCESS_PREVENT_NONDEF_OVERWR) { const char *defval = env_get_default(name);
@@ -590,19 +589,22 @@ int env_flags_validate(const struct env_entry *item, const char *newval,
if (strcmp(oldval, defval) != 0) {
printf("## Error: Can't overwrite \"%s\"\n",
name);
- return 1;
+ ok = false;
}
}
break;
case env_op_create:
if (item->flags & ENV_FLAGS_VARACCESS_PREVENT_CREATE) { printf("## Error: Can't create \"%s\"\n", name);
- return 1;
+ ok = false;
}
break;
}
- return 0;
+ if (!ok)
+ printf("## Error: Can't force access to \"%s\"\n", name); +
+ return ok ? 0 : 1;
}
#endif
Signature · 1 line
Alex Kiernan
PATCH 1/1 Revert "env: Warn on force access if ENV_ACCESS_IGNORE_FORCE set"
In reply to Tom RiniQuoted 26 lines · Tom Rini
Quoted 25 lines · Marek Vasut
Quoted 23 lines · Alex Kiernan
This reverts commit
0f036bf4b87e6416f5c4d23865a62a62d9073c20.With this change applied and
CONFIG_ENV_ACCESS_IGNORE_FORCEdisabled, the warning appears on every force overwrite, but the variable is then written to:=> env print ethaddr
ethaddr=00:1C:2B:08:AF:65
=> env set ethaddr 00:00:00:00:00:00
## Error: Can't overwrite "ethaddr"
## Error inserting "ethaddr" variable, errno=1
=> env print ethaddr
ethaddr=00:1C:2B:08:AF:65
=> env set -f ethaddr 00:00:00:00:00:00
## Error: Can't force access to "ethaddr"
=> env print ethaddr
ethaddr=00:00:00:00:00:00Signed-off-by Alex Kiernan <[email protected]>---
As I noted in my email, I can't see an immediately obvious way to make this work as intended and given we're at -rc3, I think a revert is the most appropriate way forward.
Quoted 8 lines
Quoted 2 lines
Can you please spend some more time on proper fix, instead of just reverting ? Reverting isn't the way forward most of the time.
Can you assist in that? So far the original patch broke the EFI tests, but Heinrich and I came up with a compromise (but it's also I suspect that Alex saw). It is probably better to go back to the same behavior as the last release and try again next release once the problem can be addressed by someone.
I have to wonder how could the original patch break anything, when it only adds a single printf() statement. The issue described above would manifest either way -- with or without the patch -- and is thus a separate issue altogether.
So I believe this patch is wrong.