Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1iLRXJ-0005AN-Ey for mharc-grub-devel@gnu.org; Fri, 18 Oct 2019 08:39:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42417) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLRXH-00058U-Fi for grub-devel@gnu.org; Fri, 18 Oct 2019 08:39:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iLRXG-0005N3-89 for grub-devel@gnu.org; Fri, 18 Oct 2019 08:39:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36260) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iLRXG-0005Mt-1I for grub-devel@gnu.org; Fri, 18 Oct 2019 08:39:14 -0400 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E942383F45 for ; Fri, 18 Oct 2019 12:39:12 +0000 (UTC) Received: by mail-wr1-f70.google.com with SMTP id e25so2031230wra.9 for ; Fri, 18 Oct 2019 05:39:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=xm7eJGG+a4xg+CNC8yYYp5atsGWY/hCYEZTsWof6eis=; b=rK7R78hOYdQabobexTmT8sX1cYY5TfEjfbRH2CQnhpMKYQVjkEZd21CVplutSwB5x/ ADTgxGeqnhLjBsxqVj7xYZH1fw+cboLpHKobEcUVIT6EE1MjKv1olB6KePZcUARLUQyX bGdEwa2S6SxHUSvKLCflVNof6hzzVZrP0dHWjq60+UhFDcUEAG+ROV7AvQ8RiASZFuCQ oBBNeN20tGknAMqEa5cpPF5pfHDkaqoJmkrIiAsLgwJP3fwqaQPgP1uHtAJv+PjeipXe SdRFa6lhlYKoSE25snReq//RwKu5ImjbDbsrDUeD0E74PtM0EN7MybSAT+OazfviNewW qPXw== X-Gm-Message-State: APjAAAV+JXmfMAPzQ8XxlpykvpcuDW75kqhzCZ8y6llzbTO7QQUZokUO /zGA96kGmZFz+nBe5d2F6H05Se5HMgF81vFPTt084ln41JS1X8juHKp4ntdunBkvv5lZcRSlK3o 1b6Tt/k4xHq4= X-Received: by 2002:a7b:caa9:: with SMTP id r9mr7081934wml.133.1571402351431; Fri, 18 Oct 2019 05:39:11 -0700 (PDT) X-Google-Smtp-Source: APXvYqzKSDlIl2WlPoFDGq8lKYfoKtwvqEm+X3HIEZTvlXjXo8I3AG3yZj7SpsCCqf8vfJKRlEFODQ== X-Received: by 2002:a7b:caa9:: with SMTP id r9mr7081921wml.133.1571402351215; Fri, 18 Oct 2019 05:39:11 -0700 (PDT) Received: from minerva.redhat.com ([90.168.169.92]) by smtp.gmail.com with ESMTPSA id n15sm6466917wrw.47.2019.10.18.05.39.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Oct 2019 05:39:10 -0700 (PDT) From: Javier Martinez Canillas To: grub-devel@gnu.org Cc: Hector Marco-Gisbert , Ismael Ripoll-Ripoll , Javier Martinez Canillas Subject: [PATCH] Fix security issue when reading username and password Date: Fri, 18 Oct 2019 14:39:01 +0200 Message-Id: <20191018123901.13945-1-javierm@redhat.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Oct 2019 12:39:16 -0000 From: Hector Marco-Gisbert This patch fixes two integer underflows at: * grub-core/lib/crypto.c * grub-core/normal/auth.c Resolves: CVE-2015-8370 Signed-off-by: Hector Marco-Gisbert Signed-off-by: Ismael Ripoll-Ripoll Signed-off-by: Javier Martinez Canillas --- grub-core/lib/crypto.c | 2 +- grub-core/normal/auth.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/grub-core/lib/crypto.c b/grub-core/lib/crypto.c index ca334d5a40e..e6c78d16d39 100644 --- a/grub-core/lib/crypto.c +++ b/grub-core/lib/crypto.c @@ -468,7 +468,7 @@ grub_password_get (char buf[], unsigned buf_size) break; } =20 - if (key =3D=3D '\b') + if (key =3D=3D '\b' && cur_len) { if (cur_len) cur_len--; diff --git a/grub-core/normal/auth.c b/grub-core/normal/auth.c index 6be678c0de1..c35ce972473 100644 --- a/grub-core/normal/auth.c +++ b/grub-core/normal/auth.c @@ -172,7 +172,7 @@ grub_username_get (char buf[], unsigned buf_size) break; } =20 - if (key =3D=3D GRUB_TERM_BACKSPACE) + if (key =3D=3D GRUB_TERM_BACKSPACE && cur_len) { if (cur_len) { --=20 2.21.0