From patchwork Fri Feb 15 00:36:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Mendoza-Jonas X-Patchwork-Id: 1042542 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 440vTf6dJVz9s7T for ; Fri, 15 Feb 2019 11:36:54 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=mendozajonas.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=mendozajonas.com header.i=@mendozajonas.com header.b="Crvj+RZE"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="6maicr7r"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 440vTf5bL8zDqXG for ; Fri, 15 Feb 2019 11:36:54 +1100 (AEDT) X-Original-To: petitboot@lists.ozlabs.org Delivered-To: petitboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=mendozajonas.com (client-ip=66.111.4.26; helo=out2-smtp.messagingengine.com; envelope-from=sam@mendozajonas.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=mendozajonas.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=mendozajonas.com header.i=@mendozajonas.com header.b="Crvj+RZE"; dkim=pass (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="6maicr7r"; dkim-atps=neutral Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 440vT86tCGzDqWc for ; Fri, 15 Feb 2019 11:36:28 +1100 (AEDT) Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id B9D7A2294D; Thu, 14 Feb 2019 19:36:26 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Thu, 14 Feb 2019 19:36:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= mendozajonas.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; s=fm2; bh=J1cYtC/lsy//Yz4gal19XyMM6fO2RLUGKfgSJ5MYDms=; b=Crvj+ RZEtSJa2scEcRnU00pWzeeRfZ0M/kUrxcFirc4T5FTiwjbtcBzLHrNAgdIcFcy3Y nKpKXL2uUG+UgUBf0XwvlemDsAQCNbvkD8iaLzTj1vrH+9t1N7L8UELl1ZjXydxy Evftv/qEc/Xfg1GyFli85nDg+ZjwEaB2hYpPrFt8vODmlqxR6AUCjIMc7C5xP0jK Y7DlhJGPkf2J9iSxP+lbBvf3tlPCQ1wRxXLOBKU4uWdXv2OiKauSWBRH9D3ZautO FBt/EyoRBJY/8ogXIDiIWAaHsUJxqm7DoN66T+v7j3zg77NPr8c8IKnyx4uEMnRj 0fXxfJbL1Mb54Q9yg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=J1cYtC/lsy//Yz4gal19XyMM6fO2RLUGKfgSJ5MYDms=; b=6maicr7r VsfsYAkxhbY9D7YZyykPalTfPfPhDNRSlRT6VRHP52ku7Btc6OyxM3DGm2Eoc3NV ljPO/Aie1h7jBHgOsFl8Q6E/oE/C/iFZ35zc0kShqSv/3xGKrUs0Tp/2TlCyPdc4 +wI2Cg1ICntchfwBU+WbSU3w6OaplaldTDG5gdM2Y59BXWFyw6Wg+VsNqwJK+Fuc vzI9259OQbM1wKYllfR9AGjY5GrbEwbdkdKSrTd22I68D8RdknXmCkx5oAR1PlaT oTEoP0Cq6gsn9HdI9itmgmRtE4KgKTN3hag/OivOb6+LVoRhPrKJ6XEsMRkwkWw8 6rXrqhCl2ilaVw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedtledruddtiedgvdduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfquhhtnecuuegrihhlohhuthemucef tddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpe furghmuhgvlhcuofgvnhguohiirgdqlfhonhgrshcuoehsrghmsehmvghnughoiigrjhho nhgrshdrtghomheqnecukfhppeduvddvrdelledrkedvrddutdenucfrrghrrghmpehmrg hilhhfrhhomhepshgrmhesmhgvnhguohiirghjohhnrghsrdgtohhmnecuvehluhhsthgv rhfuihiivgeptd X-ME-Proxy: Received: from v4.ozlabs.ibm.com (unknown [122.99.82.10]) by mail.messagingengine.com (Postfix) with ESMTPA id 50472E4068; Thu, 14 Feb 2019 19:36:25 -0500 (EST) From: Samuel Mendoza-Jonas To: petitboot@lists.ozlabs.org Subject: [PATCH 2/5] lib/process: Add option to pipe to process stdin Date: Fri, 15 Feb 2019 11:36:00 +1100 Message-Id: <20190215003603.16285-3-sam@mendozajonas.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190215003603.16285-1-sam@mendozajonas.com> References: <20190215003603.16285-1-sam@mendozajonas.com> MIME-Version: 1.0 X-BeenThere: petitboot@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Petitboot bootloader development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Samuel Mendoza-Jonas Errors-To: petitboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Petitboot" If pipe_stdin exists, create a second pipe to write to the child process's STDIN. This allows Petitboot to pipe information to a process, for example piping a LUKS password to cryptsetup. Signed-off-by: Samuel Mendoza-Jonas --- lib/process/process.c | 33 +++++++++++++++++++++++++++++++++ lib/process/process.h | 1 + 2 files changed, 34 insertions(+) diff --git a/lib/process/process.c b/lib/process/process.c index 02b6f490..7bd29b82 100644 --- a/lib/process/process.c +++ b/lib/process/process.c @@ -50,6 +50,7 @@ struct process_info { int stdout_buf_len; struct waiter *stdout_waiter; int stdout_pipe[2]; + int stdin_pipe[2]; void *orig_ctx; }; @@ -130,12 +131,37 @@ static int process_setup_stdout_pipe(struct process_info *procinfo) return 0; } +static void process_setup_stdin_parent(struct process_info *procinfo) +{ + FILE *in; + + if (!procinfo->process.pipe_stdin) + return; + + close(procinfo->stdin_pipe[0]); + in = fdopen(procinfo->stdin_pipe[1], "w"); + if (!in) { + pb_log_fn("Failed to open stdin\n"); + return; + } + fputs(procinfo->process.pipe_stdin, in); + fflush(in); +} + +static void process_setup_stdin_child(struct process_info *procinfo) +{ + if (procinfo->process.pipe_stdin) { + close(procinfo->stdin_pipe[1]); + dup2(procinfo->stdin_pipe[0], STDIN_FILENO); + } +} static void process_setup_stdout_parent(struct process_info *procinfo) { if (!procinfo->process.keep_stdout || procinfo->process.raw_stdout) return; close(procinfo->stdout_pipe[1]); + } static void process_setup_stdout_child(struct process_info *procinfo) @@ -350,6 +376,11 @@ static int process_run_common(struct process_info *procinfo) rc = process_setup_stdout_pipe(procinfo); if (rc) return rc; + if (procinfo->process.pipe_stdin) { + rc = pipe(procinfo->stdin_pipe); + if (rc) + return rc; + } pid = fork(); if (pid < 0) { @@ -359,6 +390,7 @@ static int process_run_common(struct process_info *procinfo) if (pid == 0) { process_setup_stdout_child(procinfo); + process_setup_stdin_child(procinfo); if (procset->dry_run) exit(EXIT_SUCCESS); execvp(process->path, (char * const *)process->argv); @@ -366,6 +398,7 @@ static int process_run_common(struct process_info *procinfo) } process_setup_stdout_parent(procinfo); + process_setup_stdin_parent(procinfo); process->pid = pid; return 0; diff --git a/lib/process/process.h b/lib/process/process.h index 9473a0d4..eb6e3360 100644 --- a/lib/process/process.h +++ b/lib/process/process.h @@ -43,6 +43,7 @@ struct process { void *data; waiter_cb stdout_cb; void *stdout_data; + char *pipe_stdin; /* runtime data */ pid_t pid;