Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

trust: don't create file names longer then 255 #659

Merged
merged 1 commit into from
Oct 4, 2024
Merged

trust: don't create file names longer then 255 #659

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions trust/save.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@
#define O_DIRECTORY 0
#endif

#define MAX_FILE_NAME 255

struct _p11_save_file {
char *bare;
char *extension;
Expand Down Expand Up @@ -414,12 +416,23 @@ make_unique_name (const char *bare,
p11_buffer buf;
int ret;
int i;
int bare_len, ext_len, diff;

assert (bare != NULL);
assert (check != NULL);

p11_buffer_init_null (&buf, 0);

/*
* Make sure the name will not be longer then MAX_FILE_NAME
*/
bare_len = strlen (bare);
ext_len = extension ? strlen (extension) : 0;
diff = bare_len + ext_len + sizeof (unique) - MAX_FILE_NAME;
if (diff > 0)
bare_len -= diff;
return_val_if_fail (bare_len > 0, NULL);

for (i = 0; true; i++) {

p11_buffer_reset (&buf, 64);
Expand All @@ -431,7 +444,7 @@ make_unique_name (const char *bare,
* provided by the caller.
*/
case 0:
p11_buffer_add (&buf, bare, -1);
p11_buffer_add (&buf, bare, bare_len);
break;

/*
Expand All @@ -448,14 +461,14 @@ make_unique_name (const char *bare,
/* fall through */

default:
p11_buffer_add (&buf, bare, -1);
p11_buffer_add (&buf, bare, bare_len);
snprintf (unique, sizeof (unique), ".%d", i);
p11_buffer_add (&buf, unique, -1);
break;
}

if (extension)
p11_buffer_add (&buf, extension, -1);
p11_buffer_add (&buf, extension, ext_len);

return_val_if_fail (p11_buffer_ok (&buf), NULL);

Expand Down
Loading