yggdrasil/binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s390: Use safe string functions and length macros in s390-mkopc

Browse Source 
Use strncpy() and snprintf() instead of strcpy() and strcat(). Define
and use macros for string lengths, such as mnemonic, instruction
format, and instruction description.

This is a mechanical change, although some buffers have increased in
length by one character. This has been confirmed by verifying that the
generated opcode/s390-opc.tab is unchanged.

opcodes/
	* s390-mkopc.c: Use strncpy() and strncat().

Suggested-by: Nick Clifton <nickc@redhat.com>
Signed-off-by: Jens Remus <jremus@linux.ibm.com>
Reviewed-by: Andreas Krebbel <krebbel@linux.ibm.com>
This commit is contained in:
Jens Remus 2023-12-20 11:17:39 +01:00 committed by Andreas Krebbel
parent 730e7ddc24
commit a3fa108623
1 changed files with 52 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
opcodes/s390-mkopc.c
View File

@ -25,6 +25,19 @@
#include <string.h> #include <string.h>
#include "opcode/s390.h" #include "opcode/s390.h"
#define STRINGIFY(x) _STRINGIFY(x)
#define _STRINGIFY(x) #x
/* Length of strings without terminating '\0' character. */
#define MAX_OPCODE_LEN 15
#define MAX_MNEMONIC_LEN 15
#define MAX_FORMAT_LEN 15
#define MAX_DESCRIPTION_LEN 79
#define MAX_CPU_LEN 15
#define MAX_MODES_LEN 15
#define MAX_FLAGS_LEN 79
/* Return code. */ /* Return code. */
int return_code = EXIT_SUCCESS; int return_code = EXIT_SUCCESS;
@ -44,9 +57,9 @@ print_error (const char *fmt, ...)
struct op_struct struct op_struct
{ {
char opcode[16]; char opcode[MAX_OPCODE_LEN + 1];
char mnemonic[16]; char mnemonic[MAX_MNEMONIC_LEN + 1];
char format[16]; char format[MAX_FORMAT_LEN + 1];
int mode_bits; int mode_bits;
int min_cpu; int min_cpu;
int flags; int flags;
@ -108,9 +121,12 @@ insertOpcode (char *opcode, char *mnemonic, char *format,
break; break;
for (k = no_ops; k > ix; k--) for (k = no_ops; k > ix; k--)
op_array[k] = op_array[k-1]; op_array[k] = op_array[k-1];
strcpy(op_array[ix].opcode, opcode); strncpy (op_array[ix].opcode, opcode, MAX_OPCODE_LEN);
strcpy(op_array[ix].mnemonic, mnemonic); op_array[ix].opcode[MAX_OPCODE_LEN] = '\0';
strcpy(op_array[ix].format, format); strncpy (op_array[ix].mnemonic, mnemonic, MAX_MNEMONIC_LEN);
op_array[ix].mnemonic[MAX_MNEMONIC_LEN] = '\0';
strncpy (op_array[ix].format, format, MAX_FORMAT_LEN);
op_array[ix].format[MAX_FORMAT_LEN] = '\0';
op_array[ix].sort_value = sort_value; op_array[ix].sort_value = sort_value;
op_array[ix].no_nibbles = no_nibbles; op_array[ix].no_nibbles = no_nibbles;
op_array[ix].min_cpu = min_cpu; op_array[ix].min_cpu = min_cpu;
@ -180,9 +196,9 @@ insertExpandedMnemonic (char *opcode, char *mnemonic, char *format,
int min_cpu, int mode_bits, int flags) int min_cpu, int mode_bits, int flags)
{ {
char *tag; char *tag;
char prefix[15]; char prefix[MAX_MNEMONIC_LEN + 1];
char suffix[15]; char suffix[MAX_MNEMONIC_LEN + 1];
char number[15]; char number[MAX_MNEMONIC_LEN + 1];
int mask_start, i = 0, tag_found = 0, reading_number = 0; int mask_start, i = 0, tag_found = 0, reading_number = 0;
int number_p = 0, suffix_p = 0, prefix_p = 0; int number_p = 0, suffix_p = 0, prefix_p = 0;
const struct s390_cond_ext_format *ext_table; const struct s390_cond_ext_format *ext_table;
@ -263,12 +279,17 @@ insertExpandedMnemonic (char *opcode, char *mnemonic, char *format,
for (i = 0; i < ext_table_length; i++) for (i = 0; i < ext_table_length; i++)
{ {
char new_mnemonic[15]; char new_mnemonic[MAX_MNEMONIC_LEN + 1];
strcpy (new_mnemonic, prefix);
opcode[mask_start] = ext_table[i].nibble; opcode[mask_start] = ext_table[i].nibble;
strcat (new_mnemonic, ext_table[i].extension);
strcat (new_mnemonic, suffix); if (snprintf (new_mnemonic, sizeof (new_mnemonic), "%s%s%s", prefix,
ext_table[i].extension, suffix) >= sizeof (new_mnemonic))
{
print_error ("Mnemonic: \"%s\": Concatenated mnemonic exceeds max. length\n", mnemonic);
return;
}
insertOpcode (opcode, new_mnemonic, format, min_cpu, mode_bits, flags); insertOpcode (opcode, new_mnemonic, format, min_cpu, mode_bits, flags);
} }
return; return;
@ -338,13 +359,13 @@ main (void)
make an entry into the opcode table. */ make an entry into the opcode table. */
while (fgets (currentLine, sizeof (currentLine), stdin) != NULL) while (fgets (currentLine, sizeof (currentLine), stdin) != NULL)
{ {
char opcode[16]; char opcode[MAX_OPCODE_LEN + 1];
char mnemonic[16]; char mnemonic[MAX_MNEMONIC_LEN + 1];
char format[16]; char format[MAX_FORMAT_LEN + 1];
char description[80]; char description[MAX_DESCRIPTION_LEN + 1];
char cpu_string[16]; char cpu_string[MAX_CPU_LEN + 1];
char modes_string[16]; char modes_string[MAX_MODES_LEN + 1];
char flags_string[80]; char flags_string[MAX_FLAGS_LEN + 1];
int min_cpu; int min_cpu;
int mode_bits; int mode_bits;
int flag_bits; int flag_bits;
@ -353,11 +374,17 @@ main (void)
if (currentLine[0] == '#' || currentLine[0] == '\n') if (currentLine[0] == '#' || currentLine[0] == '\n')
continue; continue;
memset (opcode, 0, 8); memset (opcode, '\0', sizeof(opcode));
num_matched = num_matched = sscanf (currentLine,
sscanf (currentLine, "%15s %15s %15s \"%79[^\"]\" %15s %15s %79[^\n]", "%" STRINGIFY (MAX_OPCODE_LEN) "s "
opcode, mnemonic, format, description, "%" STRINGIFY (MAX_MNEMONIC_LEN) "s "
cpu_string, modes_string, flags_string); "%" STRINGIFY (MAX_FORMAT_LEN) "s "
"\"%" STRINGIFY (MAX_DESCRIPTION_LEN) "[^\"]\" "
"%" STRINGIFY (MAX_CPU_LEN) "s "
"%" STRINGIFY (MAX_MODES_LEN) "s "
"%" STRINGIFY (MAX_FLAGS_LEN) "[^\n]",
opcode, mnemonic, format, description,
cpu_string, modes_string, flags_string);
if (num_matched != 6 && num_matched != 7) if (num_matched != 6 && num_matched != 7)
{ {
print_error ("Couldn't scan line %s\n", currentLine); print_error ("Couldn't scan line %s\n", currentLine);