Index: ipmi_fru.c =================================================================== RCS file: /cvsroot/ipmitool/ipmitool/lib/ipmi_fru.c,v retrieving revision 1.69 diff -u -r1.69 ipmi_fru.c --- ipmi_fru.c 2 Nov 2012 06:35:51 -0000 1.69 +++ ipmi_fru.c 11 Nov 2012 17:55:19 -0000 @@ -59,8 +59,6 @@ #define LIMIT_ALL_REQUEST_SIZE 1 #define FRU_MULTIREC_CHUNK_SIZE (255 + sizeof(struct fru_multirec_header)) -static char fileName[512]; - extern int verbose; static void ipmi_fru_read_to_bin(struct ipmi_intf * intf, char * pFileName, uint8_t fruId); @@ -217,6 +215,35 @@ return (-1); } /* is_fru_id(...) */ +/* is_valid_filename - checks file/path supplied by user + * + * input_filename - user input string + * + * returns 0 if path is ok + * returns (-1) if path is NULL + * returns (-2) if path is too short + * returns (-3) if path is too long + */ +int +is_valid_filename(const char *input_filename) +{ + if (input_filename == NULL) { + lprintf(LOG_ERR, "ERROR: NULL pointer passed."); + return (-1); + } + + if (strlen(input_filename) < 1) { + lprintf(LOG_ERR, "File/path is invalid."); + return (-2); + } + + if (strlen(input_filename) >= 512) { + lprintf(LOG_ERR, "File/path must be shorter than 512 bytes."); + return (-3); + } + + return 0; +} /* is_valid_filename */ /* build_fru_bloc - build fru bloc for write protection * @@ -3266,6 +3293,19 @@ free(pFruBuf); } +/* ipmi_fru_edit_help - print help text for 'fru edit' command + * + * returns void + */ +void +ipmi_fru_edit_help() +{ + lprintf(LOG_NOTICE, + "fru edit field
- edit FRU string"); + lprintf(LOG_NOTICE, + "fru edit oem iana - limited OEM support"); +} /* ipmi_fru_edit_help() */ + /* ipmi_fru_edit_multirec - Query new values to replace original FRU content * * @intf: interface to use @@ -3434,6 +3474,30 @@ return 0; } +/* ipmi_fru_get_help - print help text for 'fru get' + * + * returns void + */ +void +ipmi_fru_get_help() +{ + lprintf(LOG_NOTICE, + "fru get oem iana - limited OEM support"); +} /* ipmi_fru_get_help() */ + +void +ipmi_fru_internaluse_help() +{ + lprintf(LOG_NOTICE, + "fru internaluse info - get internal use area size"); + lprintf(LOG_NOTICE, + "fru internaluse print - print internal use area in hex"); + lprintf(LOG_NOTICE, + "fru internaluse read - read internal use area to file"); + lprintf(LOG_NOTICE, + "fru internaluse write - write internal use area from file"); +} /* void ipmi_fru_internaluse_help() */ + /* ipmi_fru_get_multirec - Query new values to replace original FRU content * * @intf: interface to use @@ -4054,6 +4118,17 @@ return 0; } +/* ipmi_fru_help - print help text for FRU subcommand + * + * returns void + */ +void +ipmi_fru_help() +{ + lprintf(LOG_NOTICE, + "FRU Commands: print read write upgEkey edit internaluse get"); +} + /* ipmi_fru_read_internal_use - print internal use are in hex or file * * @intf: ipmi interface @@ -4215,7 +4290,7 @@ int ipmi_fru_main(struct ipmi_intf * intf, int argc, char ** argv) - { +{ int rc = 0; uint8_t fru_id = 0; @@ -4223,11 +4298,17 @@ rc = ipmi_fru_print_all(intf); } else if (strncmp(argv[0], "help", 4) == 0) { - lprintf(LOG_ERR, "FRU Commands: print read write upgEkey edit internaluse"); + ipmi_fru_help(); + return 0; } else if (strncmp(argv[0], "print", 5) == 0 || strncmp(argv[0], "list", 4) == 0) { if (argc > 1) { + if (strcmp(argv[1], "help") == 0) { + lprintf(LOG_NOTICE, "fru print [fru id] - print information about FRU(s)"); + return 0; + } + if (is_fru_id(argv[1], &fru_id) != 0) return (-1); @@ -4237,198 +4318,210 @@ } } else if (!strncmp(argv[0], "read", 5)) { - if((argc >= 3) && (strlen(argv[2]) > 0)){ - /* There is a file name in the parameters */ - if(strlen(argv[2]) < 512) - { - if (is_fru_id(argv[1], &fru_id) != 0) - return (-1); - - strcpy(fileName, argv[2]); - if (verbose){ - printf("Fru Id : %d\n", fru_id); - printf("Fru File : %s\n", fileName); - } - ipmi_fru_read_to_bin(intf, fileName, fru_id); - } - else{ - fprintf(stderr,"File name must be smaller than 512 bytes\n"); - } + if (argc >= 1 && strcmp(argv[1], "help") == 0) { + lprintf(LOG_NOTICE, "fru read "); + return 0; + } else if (argc < 3) { + lprintf(LOG_ERR, "Not enough parameters given."); + lprintf(LOG_NOTICE, "fru read "); + lprintf(LOG_NOTICE, "FRU ID and file(incl. full path) must be specified."); + lprintf(LOG_NOTICE, "Example: ipmitool fru read 0 /root/fru.bin"); + return (-1); } - else{ - printf("fru read \n"); + + if (is_fru_id(argv[1], &fru_id) != 0) + return (-1); + + /* There is a file name in the parameters */ + if (is_valid_filename(argv[2]) != 0) + return (-1); + + if (verbose) { + printf("FRU ID : %d\n", fru_id); + printf("FRU File : %s\n", argv[2]); } + /* TODO - rc is missing */ + ipmi_fru_read_to_bin(intf, argv[2], fru_id); } else if (!strncmp(argv[0], "write", 5)) { - if ((argc >= 3) && (strlen(argv[2]) > 0)) { - /* There is a file name in the parameters */ - if (strlen(argv[2]) < 512) { - if (is_fru_id(argv[1], &fru_id) != 0) - return (-1); + if (argc >= 1 && strcmp(argv[1], "help") == 0) { + lprintf(LOG_NOTICE, "fru write "); + return 0; + } else if (argc < 3) { + lprintf(LOG_ERR, "Not enough parameters given."); + lprintf(LOG_NOTICE, "fru write "); + lprintf(LOG_NOTICE, "FRU ID and file(incl. full path) must be specified."); + lprintf(LOG_NOTICE, "Example: ipmitool fru write 0 /root/fru.bin"); + return (-1); + } - strcpy(fileName, argv[2]); - if (verbose) { - printf("Fru Id : %d\n", fru_id); - printf("Fru File : %s\n", fileName); - } - ipmi_fru_write_from_bin(intf, fileName, fru_id); - } else { - lprintf(LOG_ERR, "File name must be smaller than 512 bytes\n"); - } - } else { - lprintf(LOG_ERR, "A Fru Id and a path/file name must be specified\n"); - lprintf(LOG_ERR, "Ex.: ipmitool fru write 0 /root/fru.bin\n"); + if (is_fru_id(argv[1], &fru_id) != 0) + return (-1); + + /* There is a file name in the parameters */ + if (is_valid_filename(argv[2]) != 0) + return (-1); + + if (verbose) { + printf("FRU ID : %d\n", fru_id); + printf("FRU File : %s\n", argv[2]); } + /* TODO - rc is missing */ + ipmi_fru_write_from_bin(intf, argv[2], fru_id); } else if (!strncmp(argv[0], "upgEkey", 7)) { - if ((argc >= 3) && (strlen(argv[2]) > 0)) { - if (is_fru_id(argv[1], &fru_id) != 0) + if (argc >= 1 && strcmp(argv[1], "help") == 0) { + lprintf(LOG_NOTICE, "fru upgEkey "); + return 0; + } else if (argc < 3) { + lprintf(LOG_ERR, "Not enough parameters given."); + lprintf(LOG_NOTICE, "fru upgEkey "); + lprintf(LOG_NOTICE, "FRU ID and file(incl. full path) must be specified."); + lprintf(LOG_NOTICE, "Example: ipmitool fru upgEkey 0 /root/fru.bin"); + return (-1); + } + + if (is_fru_id(argv[1], &fru_id) != 0) + return (-1); + + /* There is a file name in the parameters */ + if (is_valid_filename(argv[2]) != 0) return (-1); - strcpy(fileName, argv[2]); - ipmi_fru_upg_ekeying(intf, fileName, fru_id); - } else { - printf("fru upgEkey \n"); - } + rc = ipmi_fru_upg_ekeying(intf, argv[2], fru_id); } else if (!strncmp(argv[0], "internaluse", 11)) { - if ( - (argc >= 3) - && - (!strncmp(argv[2], "info", 4)) - ) - { + if (argc >= 1 && strcmp(argv[1], "help") == 0) { + ipmi_fru_internaluse_help(); + return 0; + } + + if ( (argc >= 3) && (!strncmp(argv[2], "info", 4)) ) { + if (is_fru_id(argv[1], &fru_id) != 0) return (-1); - ipmi_fru_info_internal_use(intf, fru_id); + rc = ipmi_fru_info_internal_use(intf, fru_id); } - else if ( - (argc >= 3) - && - (!strncmp(argv[2], "print", 5)) - ) - { + else if ( (argc >= 3) && (!strncmp(argv[2], "print", 5)) ) { + if (is_fru_id(argv[1], &fru_id) != 0) return (-1); - ipmi_fru_read_internal_use(intf, fru_id, NULL); + rc = ipmi_fru_read_internal_use(intf, fru_id, NULL); } - else if ( - (argc >= 4) - && - (!strncmp(argv[2], "read", 4)) - && - (strlen(argv[3]) > 0) - ) - { + else if ( (argc >= 4) && (!strncmp(argv[2], "read", 4)) ) { + if (is_fru_id(argv[1], &fru_id) != 0) return (-1); - strcpy(fileName, argv[3]); - lprintf(LOG_DEBUG, "Fru Id : %d", fru_id); - lprintf(LOG_DEBUG, "Fru File : %s", fileName); - ipmi_fru_read_internal_use(intf, fru_id, fileName); - } - else if ( - (argc >= 4) - && - (!strncmp(argv[2], "write", 5)) - && - (strlen(argv[3]) > 0) - ) - { + /* There is a file name in the parameters */ + if (is_valid_filename(argv[3]) != 0) + return (-1); + + lprintf(LOG_DEBUG, "FRU ID : %d", fru_id); + lprintf(LOG_DEBUG, "FRU File : %s", argv[3]); + + rc = ipmi_fru_read_internal_use(intf, fru_id, argv[3]); + } + else if ( (argc >= 4) && (!strncmp(argv[2], "write", 5)) ) { + if (is_fru_id(argv[1], &fru_id) != 0) return (-1); - strcpy(fileName, argv[3]); - lprintf(LOG_DEBUG, "Fru Id : %d", fru_id); - lprintf(LOG_DEBUG, "Fru File : %s", fileName); - ipmi_fru_write_internal_use(intf, fru_id, fileName); - } - else - { - printf("fru internaluse info - get internal use area size\n"); - printf("fru internaluse print - print internal use area in hex\n"); - printf("fru internaluse read - read internal use area to file\n"); - printf("fru internaluse write - write internal use area from file\n"); - } - } + /* There is a file name in the parameters */ + if (is_valid_filename(argv[3]) != 0) + return (-1); - else if (!strncmp(argv[0], "edit", 4)) { + lprintf(LOG_DEBUG, "FRU ID : %d", fru_id); + lprintf(LOG_DEBUG, "FRU File : %s", argv[3]); - if ((argc >= 2) && (strncmp(argv[1], "help", 4) == 0)) { - lprintf(LOG_ERR, "edit commands:"); - lprintf(LOG_ERR, " edit - interactively edit records"); - lprintf(LOG_ERR, - " edit field
- edit FRU string"); - lprintf(LOG_ERR, - " edit oem iana - limited OEM support"); + rc = ipmi_fru_write_internal_use(intf, fru_id, argv[3]); } else { - if ((argc >= 2) && (strlen(argv[1]) > 0)) { - if (is_fru_id(argv[1], &fru_id) != 0) - return (-1); + lprintf(LOG_ERR, + "Either unknown command or not enough parameters given."); + ipmi_fru_internaluse_help(); + return (-1); + } + } + else if (!strncmp(argv[0], "edit", 4)) { + if (argc >= 1 && strcmp(argv[1], "help") == 0) { + ipmi_fru_edit_help(); + return 0; + } else if (argc < 2) { + lprintf(LOG_ERR, "Not enough parameters given."); + ipmi_fru_edit_help(); + return (-1); + } + + if (argc >= 2) { + if (is_fru_id(argv[1], &fru_id) != 0) + return (-1); - if (verbose) { - printf("Fru Id : %d\n", fru_id); - } - } else { - printf("Using default FRU id: %d\n", fru_id); + if (verbose) { + printf("FRU ID : %d\n", fru_id); } + } else { + printf("Using default FRU ID: %d\n", fru_id); + } - if ((argc >= 3) && (strlen(argv[1]) > 0)) { - if (!strncmp(argv[2], "field", 5)){ - if (argc == 6) { - ipmi_fru_set_field_string(intf, fru_id,\ - *argv[3], *argv[4], (char *) argv[5]); - } - else { - printf("fru edit [fruid] field [section] [index] [string]\n"); - } - }else if (!strncmp(argv[2], "oem", 3)){ - ipmi_fru_edit_multirec(intf, fru_id, argc, argv); + if ((argc >= 3) && (strlen(argv[1]) > 0)) { + if (!strncmp(argv[2], "field", 5)) { + if (argc != 6) { + lprintf(LOG_ERR, "Not enough parameters given."); + ipmi_fru_edit_help(); + return (-1); } + rc = ipmi_fru_set_field_string(intf, fru_id, *argv[3], *argv[4], + (char *) argv[5]); + } else if (!strncmp(argv[2], "oem", 3)) { + rc = ipmi_fru_edit_multirec(intf, fru_id, argc, argv); } else { - ipmi_fru_edit_multirec(intf, fru_id, argc, argv); + lprintf(LOG_ERR, "Invalid command: %s", argv[2]); + ipmi_fru_edit_help(); + return (-1); } - + } else { + rc = ipmi_fru_edit_multirec(intf, fru_id, argc, argv); } } else if (!strncmp(argv[0], "get", 4)) { + if (argc >= 1 && (strncmp(argv[1], "help", 4) == 0)) { + ipmi_fru_get_help(); + return 0; + } else if (argc < 2) { + lprintf(LOG_ERR, "Not enough parameters given."); + ipmi_fru_get_help(); + return (-1); + } - if ((argc >= 2) && (strncmp(argv[1], "help", 4) == 0)) { - lprintf(LOG_ERR, "get commands:"); - lprintf(LOG_ERR, " get - retrieve OEM records"); - lprintf(LOG_ERR, - " get oem iana - limited OEM support"); - } else { - - - if ((argc >= 2) && (strlen(argv[1]) > 0)) { + if (argc >= 2) { if (is_fru_id(argv[1], &fru_id) != 0) return (-1); if (verbose) { - printf("Fru Id : %d\n", fru_id); + printf("FRU ID : %d\n", fru_id); } } else { - printf("Using default FRU id: %d\n", fru_id); + printf("Using default FRU ID: %d\n", fru_id); } - if ((argc >= 3) && (strlen(argv[1]) > 0)) { - if (!strncmp(argv[2], "oem", 3)){ - ipmi_fru_get_multirec(intf, fru_id, argc, argv); + if (argc >= 3) { + if (!strncmp(argv[2], "oem", 3)) { + rc = ipmi_fru_get_multirec(intf, fru_id, argc, argv); + } else { + lprintf(LOG_ERR, "Invalid command: %s", argv[2]); + ipmi_fru_get_help(); + return (-1); } } else { - ipmi_fru_get_multirec(intf, fru_id, argc, argv); - } - + rc = ipmi_fru_get_multirec(intf, fru_id, argc, argv); } } else { lprintf(LOG_ERR, "Invalid FRU command: %s", argv[0]); - lprintf(LOG_ERR, "FRU Commands: print read write upgEkey edit"); - rc = -1; + ipmi_fru_help(); + return (-1); } return rc;