[Minios-devel] [UNIKRAFT PATCH v3 1/1] plat/kvm/arm: Add image name as the first argument

[Sharan Santhanam <sharan.santhanam@xxxxxxxxx>]

While setting up the command line arguments to an application, the user
argument start at index 0 instead of having the application name
followed by the user arguments.

Signed-off-by: Sharan Santhanam <sharan.santhanam@xxxxxxxxx>
---
 plat/kvm/arm/setup.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/plat/kvm/arm/setup.c b/plat/kvm/arm/setup.c
index b8148f9c..3046646d 100644
--- a/plat/kvm/arm/setup.c
+++ b/plat/kvm/arm/setup.c
@@ -18,6 +18,7 @@
  * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#include <uk/config.h>
 #include <libfdt.h>
 #include <sections.h>
 #include <kvm/console.h>
@@ -32,6 +33,7 @@ struct kvmplat_config _libkvmplat_cfg = { 0 };
 
 #define MAX_CMDLINE_SIZE 1024
 static char cmdline[MAX_CMDLINE_SIZE];
+static const char *appname = CONFIG_UK_NAME;
 
 smcc_psci_callfn_t smcc_psci_call;
 
@@ -181,22 +183,26 @@ static void _dtb_get_cmdline(char *cmdline, size_t maxlen)
        if (!fdtcmdline || (len <= 0))
                goto enocmdl;
 
-       strncpy(cmdline, fdtcmdline, MIN(maxlen, (unsigned int) len));
+       if (likely(maxlen >= (unsigned int)len))
+               maxlen = len;
+       else
+               uk_pr_err("Command line too long, truncated\n");
+
+       strncpy(cmdline, fdtcmdline, maxlen);
        /* ensure null termination */
-       cmdline[((unsigned int) len - 1) <= (maxlen - 1) ?
-               ((unsigned int) len - 1) : (maxlen - 1)] = '\0';
+       cmdline[maxlen - 1] = '\0';
 
        uk_pr_info("Command line: %s\n", cmdline);
        return;
 
 enocmdl:
        uk_pr_info("No command line found\n");
-       strcpy(cmdline, CONFIG_UK_NAME);
 }
 
 static void _libkvmplat_entry2(void *arg __attribute__((unused)))
 {
-       ukplat_entry_argp(NULL, (char *)cmdline, strlen(cmdline));
+       ukplat_entry_argp(DECONST(char *, appname),
+                         (char *)cmdline, strlen(cmdline));
 }
 
 void _libkvmplat_start(void *dtb_pointer)
-- 
2.20.1


_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel