From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id D830620960 for ; Tue, 11 Apr 2017 00:30:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752214AbdDKAa3 (ORCPT ); Mon, 10 Apr 2017 20:30:29 -0400 Received: from cloud.peff.net ([104.130.231.41]:59559 "EHLO cloud.peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751695AbdDKAa3 (ORCPT ); Mon, 10 Apr 2017 20:30:29 -0400 Received: (qmail 5630 invoked by uid 109); 11 Apr 2017 00:30:26 -0000 Received: from Unknown (HELO peff.net) (10.0.1.2) by cloud.peff.net (qpsmtpd/0.84) with SMTP; Tue, 11 Apr 2017 00:30:26 +0000 Received: (qmail 30404 invoked by uid 111); 11 Apr 2017 00:30:46 -0000 Received: from sigill.intra.peff.net (HELO sigill.intra.peff.net) (10.0.0.7) by peff.net (qpsmtpd/0.84) with SMTP; Mon, 10 Apr 2017 20:30:46 -0400 Received: by sigill.intra.peff.net (sSMTP sendmail emulation); Mon, 10 Apr 2017 20:30:23 -0400 Date: Mon, 10 Apr 2017 20:30:23 -0400 From: Jeff King To: =?utf-8?B?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason Cc: Git Mailing List , Junio C Hamano , Brandon Williams , Joachim Durchholz , Stefan Beller Subject: [PATCH] connect.c: handle errors from split_cmdline Message-ID: <20170411003023.ynzc76yzdmomxthp@sigill.intra.peff.net> References: <20170409191117.25175-1-avarab@gmail.com> <20170409191117.25175-3-avarab@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Tue, Apr 11, 2017 at 01:23:32AM +0200, Ævar Arnfjörð Bjarmason wrote: > There's one segfault in there: > > $ ./t5601-clone.sh --root="xtmp.$(perl -e 'print chr 39')" -v -i -d > [...] > Cloning into 'ssh-bracket-clone-plink-4'... > Segmentation fault > not ok 45 - single quoted plink.exe in GIT_SSH_COMMAND Here's a fix for that one. I think there are a few other memory irregularities in that function, too. I'll send another patch in a minute, but I wanted to get this out in case you were working on it, too. -- >8 -- Subject: [PATCH] connect.c: handle errors from split_cmdline Commit e9d9a8a4d (connect: handle putty/plink also in GIT_SSH_COMMAND, 2017-01-02) added a call to split_cmdline(), but checks only for a non-zero return to see if we got any output. Since the function returns negative values (and a NULL argv) on error, we end up dereferencing NULL and segfaulting. Arguably we could report on the parsing error here, but it's probably not worth it. This is a best-effort attempt to see if we are using plink. So we can simply return here with "no, it wasn't plink" and let the shell actually complain about the bogus quoting. Reported-by: Ævar Arnfjörð Bjarmason Signed-off-by: Jeff King --- connect.c | 2 +- t/t5601-clone.sh | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/connect.c b/connect.c index 7d65c1c73..6f2281ab0 100644 --- a/connect.c +++ b/connect.c @@ -730,7 +730,7 @@ static void handle_ssh_variant(const char *ssh_command, int is_cmdline, const char **ssh_argv; p = xstrdup(ssh_command); - if (split_cmdline(p, &ssh_argv)) { + if (split_cmdline(p, &ssh_argv) > 0) { variant = basename((char *)ssh_argv[0]); /* * At this point, variant points into the buffer diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh index b52b8acf9..9c56f771b 100755 --- a/t/t5601-clone.sh +++ b/t/t5601-clone.sh @@ -427,6 +427,12 @@ test_expect_success 'GIT_SSH_VARIANT overrides plink to tortoiseplink' ' expect_ssh "-batch -P 123" myhost src ' +test_expect_success 'clean failure on broken quoting' ' + test_must_fail \ + env GIT_SSH_COMMAND="${SQ}plink.exe -v" \ + git clone "[myhost:123]:src" sq-failure +' + # Reset the GIT_SSH environment variable for clone tests. setup_ssh_wrapper -- 2.12.2.952.g759391acc