mesh: Fix check for mkdir return value in keyring.c
PATCH v2 1/1 mesh: Fix check for mkdir return value in keyring.c
Remove check for mkdir() return value, since checking for zero does not cover "already exists" condition and adding extra check for errno value unnecessarily complicates the code. If mkdir() fails due to any reason than "already exists", the subsequent call to open() fails and the error is detected and corectly processed by the code.
--- mesh/keyring.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
mesh/keyring.c +3 -6
@@ -51,8 +51,7 @@ bool keyring_put_net_key(struct mesh_node *node, uint16_t net_idx,snprintf (key_file,PATH_MAX ,"%s%s" , node_path, net_key_dir); -if (!mkdir (key_file,0755 )) -return false; +mkdir (key_file,0755 );snprintf (key_file,PATH_MAX ,"%s%s/%3.3x" , node_path, net_key_dir, net_idx);
@@ -88,8 +87,7 @@ bool keyring_put_app_key(struct mesh_node *node, uint16_t app_idx,snprintf (key_file,PATH_MAX ,"%s%s" , node_path, app_key_dir); -if (!mkdir (key_file,0755 )) -return false; +mkdir (key_file,0755 );snprintf (key_file,PATH_MAX ,"%s%s/%3.3x" , node_path, app_key_dir, app_idx);
@@ -207,8 +205,7 @@ bool keyring_put_remote_dev_key(struct mesh_node *node, uint16_t unicast,snprintf (key_file,PATH_MAX ,"%s%s" , node_path, dev_key_dir); -if (!mkdir (key_file,0755 )) -return false; +mkdir (key_file,0755 );for (i =0 ; i < count; i++) { snprintf(key_file, PATH_MAX, "%s%s/%4.4x", node_path,
Signature · 1 line
2.26.2
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=392799
---Test result---
##############################
Test: CheckPatch - PASS
##############################
Test: CheckGitLint - PASS
##############################
Test: CheckBuild - PASS
##############################
Test: MakeCheck - PASS
---
Regards,
Linux Bluetooth
Hi Inga,
Patch works for me.
Thanks,
Steve
Quoted 53 lines · Inga Stotland
Remove check for
mkdir()return value, since checking for zero does not
cover "already exists" condition and adding extra check for errno value
unnecessarily complicates the code. Ifmkdir()fails due to any reason
than "already exists", the subsequent call toopen()fails and the error is detected and corectly processed by the code.
---
mesh/keyring.c | 9 +++------1 file changed, 3 insertions(+), 6 deletions(-)mesh/keyring.c +0
-0@@ -51,8 +51,7 @@ bool keyring_put_net_key(struct mesh_node *node, uint16_t net_idx,
snprintf(key_file,PATH_MAX, "%s%s",node_path,net_key_dir);
- if (!mkdir(key_file, 0755))
- return false;
+ mkdir(key_file, 0755);
snprintf(key_file,PATH_MAX, "%s%s/%3.3x",node_path,net_key_dir,
net_i dx);mesh/keyring.c +0
-0@@ -88,8 +87,7 @@ bool keyring_put_app_key(struct mesh_node *node, uint16_t app_idx,
snprintf(key_file,PATH_MAX, "%s%s",node_path,app_key_dir);
- if (!mkdir(key_file, 0755))
- return false;
+ mkdir(key_file, 0755);
snprintf(key_file,PATH_MAX, "%s%s/%3.3x",node_path,app_key_dir,
app_i dx);mesh/keyring.c +0
-0@@ -207,8 +205,7 @@ bool keyring_put_remote_dev_key(struct mesh_node *node, uint16_t unicast,
snprintf(key_file,PATH_MAX, "%s%s",node_path,dev_key_dir);
- if (!mkdir(key_file, 0755))
- return false;
+ mkdir(key_file, 0755);
for (i = 0; i < count; i++) {
snprintf(key_file,PATH_MAX, "%s%s/%4.4x",node_path,
Gix, Brian
AppliedApplied
Quoted 43 lines · Inga Stotland
Remove check for
mkdir()return value, since checking for zero does not cover "already exists" condition and adding extra check for errno value unnecessarily complicates the code. Ifmkdir()fails due to any reason than "already exists", the subsequent call toopen()fails and the error is detected and corectly processed by the code.--- mesh/keyring.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)mesh/keyring.c +3
-6@@ -51,8 +51,7 @@ bool keyring_put_net_key(struct mesh_node *node, uint16_t net_idx,snprintf (key_file,PATH_MAX ,"%s%s" , node_path, net_key_dir); -if (!mkdir (key_file,0755 )) -return false; +mkdir (key_file,0755 );snprintf (key_file,PATH_MAX ,"%s%s/%3.3x" , node_path, net_key_dir, net_idx);@@ -88,8 +87,7 @@ bool keyring_put_app_key(struct mesh_node *node, uint16_t app_idx,snprintf (key_file,PATH_MAX ,"%s%s" , node_path, app_key_dir); -if (!mkdir (key_file,0755 )) -return false; +mkdir (key_file,0755 );snprintf (key_file,PATH_MAX ,"%s%s/%3.3x" , node_path, app_key_dir, app_idx);@@ -207,8 +205,7 @@ bool keyring_put_remote_dev_key(struct mesh_node *node, uint16_t unicast,snprintf (key_file,PATH_MAX ,"%s%s" , node_path, dev_key_dir); -if (!mkdir (key_file,0755 )) -return false; +mkdir (key_file,0755 );for (i =0 ; i < count; i++) { snprintf(key_file, PATH_MAX, "%s%s/%4.4x", node_path,