From patchwork Thu Feb 22 22:00:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 13568181 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A44AA12D21B for ; Thu, 22 Feb 2024 22:00:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708639258; cv=none; b=gByA00C2OLtKNUUl4AXXWbMPIvp/bWBmy6f9ROHR8TofHoSGpjeTFjuS25IGt/6SAfl1GiNv33C1P8QEk90fSHc8U1nXJxaTQJnTV4TI+Ea7SLzhvSFrtYBwz6CtEdCxSNtC5MeeULaq3hrwBmrgc9ZeerlGzCjBi7wkwsngyUc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708639258; c=relaxed/simple; bh=/0jZgqFV3QHFwXdwQjyOlzwZPiSes7vDjViaGzmwhVo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=bHbtuTniiE4v+Lxd7jKghpLdRM+AdpyRWU5XWGUuM9TXPzeocRWJy69KDoy+pUjCit3/covmT1aKhbvG77FvuJNGUB5PA/mqDoOPpPN6M9+pI8BeBY1Cu85xx5/X5+euJxAGvRIUQ1G9GfSs2e+H65KkOekAkzSQuXCNdOMLrfk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=XQlrXfAN; arc=none smtp.client-ip=209.85.214.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="XQlrXfAN" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-1dc0d11d1b7so2833365ad.2 for ; Thu, 22 Feb 2024 14:00:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1708639255; x=1709244055; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=l7U2tjc40/BAOXSRwNIhZS6QrofSS9z/mAZ0ltWiA80=; b=XQlrXfANKAFX/0R+ZH81Am2eORBegGANg5R5hlUcFpf02tdb51GlueMksGS7WQ/0au yZGLlxYczA/be0Ly0T0hiO/uRUzhaty0KEeXTwxwf820+EMccDPev4ZuDYBoFKiwOmS5 ntdwRZ8AxjsYoz2HpNdGzEkFseseMQ/ZpKuq0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708639255; x=1709244055; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=l7U2tjc40/BAOXSRwNIhZS6QrofSS9z/mAZ0ltWiA80=; b=eTMJYxCm37sxVnkflfK5435b9NX1jK0Eq7NrzvZqxiiAYloehEoLdICGY7QjtZtAPQ jbGW43Y8wTqdH2NG5lSnLYJ45bsm70F2zAhahOa4250DgXOTy2btwhr1CQn+qx5YbQ2K 86MPYW/maAo+OQFHP1jjvAOXfGXlMOLQ1vEca0aQdpbHWigR+lFaut2grm2LBsMlopUV ARuW2TAaNcnhEu6RLBMnMH5pd44jlBkPo9x8ztiD7ghn1hp0uu3nOj7zv8aZWbbWDrpl X47Iig2e/gtug07muHrDb7A6iHEvgDawuPRX0begl+VGf5qIT7fkEmbuwdtBG+oYC10i VfcQ== X-Forwarded-Encrypted: i=1; AJvYcCXtatrBsg9w8dEoLQ6IxPGDEcgStK5VVviO5ms8RSSwlTOpqew563D3eiEuqAH3ty96uG51YZJ7T415eNlojic0Rye92F607HRwRfFYp+cU X-Gm-Message-State: AOJu0Yz8vMzZZ37pSinPiihrXquckAz3hyXru6Go07y0tVOCUe2eDAqq sh2e1ACuyrer3Xkwm9Fcp8NfJWydR7xTN6ECyHuQvc1eeVUhbE85Z771g2wTdA== X-Google-Smtp-Source: AGHT+IFthqR+g2dBw/UAHrs4z25heuFjZDGEvpiSvMlZdt+AxyMd9KMXGew95W1Id88zqK02C5oX0g== X-Received: by 2002:a17:903:2291:b0:1db:fd4e:329f with SMTP id b17-20020a170903229100b001dbfd4e329fmr158789plh.15.1708639254752; Thu, 22 Feb 2024 14:00:54 -0800 (PST) Received: from www.outflux.net ([198.0.35.241]) by smtp.gmail.com with ESMTPSA id c6-20020a170902c1c600b001d717e644e2sm10357386plc.247.2024.02.22.14.00.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 14:00:54 -0800 (PST) From: Kees Cook To: Tycho Andersen Cc: Kees Cook , "Tobin C . Harding" , Greg Kroah-Hartman , Guixiong Wei , linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org Subject: [PATCH v2 1/4] MAINTAINERS: Update LEAKING_ADDRESSES details Date: Thu, 22 Feb 2024 14:00:48 -0800 Message-Id: <20240222220053.1475824-1-keescook@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240222215755.it.764-kees@kernel.org> References: <20240222215755.it.764-kees@kernel.org> Precedence: bulk X-Mailing-List: linux-hardening@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=962; i=keescook@chromium.org; h=from:subject; bh=/0jZgqFV3QHFwXdwQjyOlzwZPiSes7vDjViaGzmwhVo=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBl18QSYDlmaz4o8wEpSBDere7LZ8YHox0i+LD6P fFT/CbFwrGJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZdfEEgAKCRCJcvTf3G3A Ju6MEACz0ztHen9/0jUIZ4S7P1C/KaEPNBQFSTxxU4ebUBIeSf9lR+aMLQgkRqYPHkNhKUwMyAe 0kfKRj+c2d3kl6WLlwolO6hDU8L2KJgSTIH9YUvw6C4dZm9qjGPBbP+nS+KNwjmZaP7mbr5olEz OeZlrWDukYeZGGfH0Z8HnfKZy90SSYZFpr/NN4278Hf23OnzxJcQhdIhzHkpOhyNzvB/NwSTf2w FeufXgd72gxmzIL9Ezf3sxn5HL0FbSNqrgoJ20bXnawW/jKSSZGQTCtOkm/raGNNycdBYLxG5eb 03FGXYdPXmw6KgOkEnilYPbjPRlKODOP5kSfmcHZycfRGD5sXzauQ1leB5cVRfzZINZdBMixOVz G2XO5A1+2WUxc3lP4vr/WynIHOpXwAww7lWeRQMQ7iBuxCLp3A1QDoOoR6j0bB1OHQw+VEUJ3fX QFXW5jWdlTX8hxYc/gs7munqdYDOguFquGU/Xn05okUzK4XheQ4CjO8LbMD8np9L54W7LPOEI45 o0EkGDwQwdazQn8HJPJ6rsGhnV/rY2TRIykGjLSA30uVhsEFRhXaF6vD5TDGBTMWZT57Cm7F2kl eH3d0gUmCcTu99DiFdfztZH1+hODUAEbwhtmk7EZsV/sKv8N+suvdM1C6vwnkLq6xAuJcclwBJ4 Sb5oeiSWhU8Z5sg== X-Developer-Key: i=keescook@chromium.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 Tobin hasn't been involved lately, and I can step up to be a reviewer with Tycho. I'll carry changes via the hardening tree. Signed-off-by: Kees Cook --- Cc: Tycho Andersen Cc: Tobin C. Harding --- MAINTAINERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 216d02a3fed5..cd651c4df019 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12154,11 +12154,11 @@ F: Documentation/scsi/53c700.rst F: drivers/scsi/53c700* LEAKING_ADDRESSES -M: Tobin C. Harding M: Tycho Andersen +R: Kees Cook L: linux-hardening@vger.kernel.org S: Maintained -T: git git://git.kernel.org/pub/scm/linux/kernel/git/tobin/leaks.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/hardening F: scripts/leaking_addresses.pl LED SUBSYSTEM From patchwork Thu Feb 22 22:00:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 13568184 Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D799D137910 for ; Thu, 22 Feb 2024 22:00:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708639261; cv=none; b=kw2qYved1NLTeA4dM6NV+gvMUN7525Kz+BnV5dpGelXDmAZjsm9v5R//m8ys6TQ/nOCeasvUDi/UC5xognai57b8XqR9RfOIoRsPPcQs9kfGMcrbwFUJ8m1418EK74axJX3h0x7lpTZkVNI9tGxnHm9o9yfRZ3P0G7ulsGEy73s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708639261; c=relaxed/simple; bh=uhlU0x25jSC/q8kWZ2CYfZhoRlBn6ETL7DGvp44hrLQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=mDXGGirWpWrJb9UKd2NgrlM9kuEqiAWoEKxfd4v6BqZWBSOteq0Q+1uiiEtw6Dp0UmqXF2jCV/HE+QjOwuL+YBcG005EPqjNn+I7IjUtx8dtXGLDp8JTByGdnNUuHCs0FcI10Cj0CU2aLm75N3GhJaLnaRZyeZDpqzXARnyKE+o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=JGOW/mVS; arc=none smtp.client-ip=209.85.216.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="JGOW/mVS" Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-2998950e951so220390a91.2 for ; Thu, 22 Feb 2024 14:00:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1708639257; x=1709244057; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XcbwdGDEaXBLUYjumpG+gsDxnRVJcIomd9ygoS90Aw8=; b=JGOW/mVSDOwED/5uKl5hS/1fbO18yhoJZjlAl/nKaWC9D3onMozCO6z/nL9HZR5WwY aLqOFBzPw9h6r1FqiqIA4lUOHUhlSOHS8lzv896X5ZlQvTatqET6i1e2bGCRzeg5+8ZE RBuUdOeY8uj/x05g0cLgzKhozGJTZcLWtTObs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708639257; x=1709244057; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XcbwdGDEaXBLUYjumpG+gsDxnRVJcIomd9ygoS90Aw8=; b=b/ID7pUkM1LzsmQLDTnHux1wCEkF7qzMjMTZsNhYntlE7iTEi8wC/Vc76tTSXnu7sQ ih13fHj+giywhatytEgEEvWRELld568TAWy+M8jedT0hGqYW8UXhCWT53zPQR6YmITNh fZrnkzt27xLbYE1btVddaQvm3QI1IDFw7IZpcZs/ynzBwh0lnZ+VgC22K/qMNjz4Td2Z EP+FcW87rAClkJJ73RxiPwxNNfxZ3WDJ1+NW5E6y1zLXUkK8eBXEo7nFMW8q4V+SRurW Vj/GkHT16pI3nAuK/bRdGZX9DZxZB+K028GNxmbT5yknLMYPuc3cxZUH0YoOvUAP6uvW WROQ== X-Forwarded-Encrypted: i=1; AJvYcCVMWzXknn2CtoPrIKjdf3ZvQMO2BmMWIgJ8kcYn3SEbWD2HJdJVGiXECxu2z814qqBpZvM+TY/gpZGrclmtR7QDs27sHnsLWRbHiDqF9csK X-Gm-Message-State: AOJu0YxCmVyU/vetdDrg7EhnQhHTatTn/A+mkuJoBNEdqwktApJ/5Nq0 ow+Z9XoSAeZuq32R1l8onw9PeuW3mBZ0bxJT+QCy4Qzajm5KV+ASwYBPGlmXhw== X-Google-Smtp-Source: AGHT+IGEnaDaYf0U9Tc/6ed2/idKNsq2JaDrlj/AU6Efhg5NWtvvNhaEDnNplUOrc4XSt3GIg9dA7w== X-Received: by 2002:a17:90a:d504:b0:299:4f5a:62d5 with SMTP id t4-20020a17090ad50400b002994f5a62d5mr105371pju.18.1708639257389; Thu, 22 Feb 2024 14:00:57 -0800 (PST) Received: from www.outflux.net ([198.0.35.241]) by smtp.gmail.com with ESMTPSA id qn3-20020a17090b3d4300b00298f88c3e48sm4527739pjb.11.2024.02.22.14.00.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 14:00:54 -0800 (PST) From: Kees Cook To: Tycho Andersen Cc: Kees Cook , "Tobin C. Harding" , linux-hardening@vger.kernel.org, Greg Kroah-Hartman , Guixiong Wei , linux-kernel@vger.kernel.org Subject: [PATCH v2 2/4] leaking_addresses: Use File::Temp for /tmp files Date: Thu, 22 Feb 2024 14:00:49 -0800 Message-Id: <20240222220053.1475824-2-keescook@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240222215755.it.764-kees@kernel.org> References: <20240222215755.it.764-kees@kernel.org> Precedence: bulk X-Mailing-List: linux-hardening@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1548; i=keescook@chromium.org; h=from:subject; bh=uhlU0x25jSC/q8kWZ2CYfZhoRlBn6ETL7DGvp44hrLQ=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBl18QSRxHv+PncBp1jAJSRPYWJFFgg3pzsNc/fN mCVDwrb19WJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZdfEEgAKCRCJcvTf3G3A JjY1EACmTYoMq33mIDZg1J1ccpxT9rC05SHFddeTqn6AUUuJ2ooqezEOEfFFA27Ddk8ijg1xGM3 pp4Tl54ejn2YBtA10Jgllds3r5mmkKrfT2GkefLJzqOrNQSrWvohbvcv8kLDmDMeO+xEGf1hHr8 eGKI0ugKLeqPQ6fsCshEypj7+DRbcGmGjdU3/8yWhetBF2iD9R549t+vGn+CWEPvfiM6xTCq+ys doU62myz1PWLLntN8N5b09Hn0H2+ab4U+n8TOmOFV1eqNeIDI2jZFhRs1wBbfyCWdpanhHeOmse KboyhOh0Mw6EyT7FX/SC0uWN8lhCosFPLHScOu+HjwQTdn1b7jfZHCbLzkelij2t+00aZ15bMno G9Pxpi9NI7Wx4+K2iXkxDy9+wRcXr1ThOzZWrFDR1MB6PJ5YUFR2WT/jg+LgNmm8KGdcQyhRimt XVfXyHjAkkwmjJNMQpC/aJSXPiI40cTx2Lilx477BccSMsaiCjxbu6hKS91lNIiTikPOeZWZXo1 1ipvTqdK/uI7PP6reIDKhBHaqDKX/o6RRO5K1bOyGN+HJuBJPCvZUW1iwW8eyCaNQYSffKr2Z6o Bm1ejWbbi9wdH5jfO5G41DPQL/oKjxnpQ+fEnMvnE8obItWSmlcsJbRlTR8kolHtrcyAH1fapd1 8SXzHvi1BdKbcLw== X-Developer-Key: i=keescook@chromium.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 Instead of using a statically named path in /tmp, use File::Temp to create (and remove) the temporary file used for parsing /proc/config.gz. Signed-off-by: Kees Cook --- Cc: Tycho Andersen Cc: "Tobin C. Harding" Cc: linux-hardening@vger.kernel.org --- scripts/leaking_addresses.pl | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/scripts/leaking_addresses.pl b/scripts/leaking_addresses.pl index e695634d153d..dd05fbcf15c5 100755 --- a/scripts/leaking_addresses.pl +++ b/scripts/leaking_addresses.pl @@ -23,6 +23,7 @@ use strict; use POSIX; use File::Basename; use File::Spec; +use File::Temp qw/tempfile/; use Cwd 'abs_path'; use Term::ANSIColor qw(:constants); use Getopt::Long qw(:config no_auto_abbrev); @@ -221,6 +222,7 @@ sub get_kernel_config_option { my ($option) = @_; my $value = ""; + my $tmp_fh; my $tmp_file = ""; my @config_files; @@ -228,7 +230,8 @@ sub get_kernel_config_option if ($kernel_config_file ne "") { @config_files = ($kernel_config_file); } elsif (-R "/proc/config.gz") { - my $tmp_file = "/tmp/tmpkconf"; + ($tmp_fh, $tmp_file) = tempfile("config.gz-XXXXXX", + UNLINK => 1); if (system("gunzip < /proc/config.gz > $tmp_file")) { dprint("system(gunzip < /proc/config.gz) failed\n"); @@ -250,10 +253,6 @@ sub get_kernel_config_option } } - if ($tmp_file ne "") { - system("rm -f $tmp_file"); - } - return $value; } From patchwork Thu Feb 22 22:00:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 13568183 Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DA13F13328D for ; Thu, 22 Feb 2024 22:00:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708639260; cv=none; b=ROwCR6kLPEWfBo0i5HS9lFabVE0xjQui7CzxkCdvsVh4BQDvvqmhzjfNqYjw517ZCNMmKjAC0j20RmA0b79b/20Xgh+oHIt495b4HLX2S5vFOmuYBf1V8PWyTzPK9bz/AMCeqv7ZuDf3WAAnOXcKjq+Xdnw1XKyCZYjg7/XyoSY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708639260; c=relaxed/simple; bh=UGxgHq7SGP8k5JaOrHY0DZqOtzZutiNCD5ult3MMLBE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=unUwIiATtAXeAT4SMsvJ4MLKeQVYkq5lWYwBejOs4NMYBnOzWq7xK4e/5+zNYXDSyIDdrrxsechllkKIXLRdq2uSt0J5EEDzUDk9xDdwI2ucyENNg5NddpF4TXv9zNQ/gAPPuZY2C+QL+coAA75FXW4Eqr5QVqiEHw3Vf+CXSWo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=d+p407jN; arc=none smtp.client-ip=209.85.215.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="d+p407jN" Received: by mail-pg1-f171.google.com with SMTP id 41be03b00d2f7-5cedfc32250so194297a12.0 for ; Thu, 22 Feb 2024 14:00:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1708639256; x=1709244056; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3huveT0qUmlhJikw9NWYKFn9utf763+YTzbXHUOY1cM=; b=d+p407jNS/kXodWtcM54K9gicgAo2RCVlOeK7QBkwt5cc4ax9oP9QPaUFKeIlbaapW 7kIl7ee4qPQDOpjAfFaiKt0XtvOBMK3TK+YrruIzdrGJ9w3Te1GGKH59lvwYM4rsWZk2 B7Wbu5hk3B0v+xCcHEDOvTywvBhsmg5Tm+0Z0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708639256; x=1709244056; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3huveT0qUmlhJikw9NWYKFn9utf763+YTzbXHUOY1cM=; b=kkSp0TbPJ2/GmsJdi1J7lgCZv0Fl20gBJYTsPMY0UZj+zfWXO7dGgOBI53wMXtsPE4 X8N+4a4WNRx9cu8tkixwwivqt7iZBkm4AK9x/tHkuCdwxl9iiJ397n5mNFr3fBnpsARI BjMDMd5r4ZggiYotJR0Cc0jBkzSRPdxmNfRXlezpCxJXyjZoqGnn7kgKC2z9AGKgl9Uq b5tuG2MNqE0qZhBg4VaS9kKDUN/VUJkn7k3FwPgXbaSzOAFdjKK7+dwKRPrturKzK0XA +XfVUnba2sa2EPJKzaCmeVikjBqmxPq5kMOC/IpXB1xLGXZQJgFr83wcZDP5XbEZ0TvY I7lA== X-Forwarded-Encrypted: i=1; AJvYcCXr89pV6GPCRAvW0J4EXuCxmUb5itlFG9osXVQqICZteNE3v84rC1JblsGtIWB3j6LNTTBmrTPAhwqA0OBMjYO1ZG134dodfvaoVPkxH8dk X-Gm-Message-State: AOJu0YzrIxFJSlP1UEP9Ios5p2NNY6gXuTm38bomTIaDzSCqR5xZAA9L a36/Ou4IxRvDZyGH0R+9/VoCUYLwmQ5EQnZu+HlPS/wBrjQ63P9h1zpQs0PoBw== X-Google-Smtp-Source: AGHT+IEdWlhdLG6iclrJsKpOlJCvSNrL2kdJfuiiP0i00MbyLgiP7f0DyRoxwrVrkpzLEpPv+J02Kw== X-Received: by 2002:a17:90a:e98f:b0:297:17fb:4d79 with SMTP id v15-20020a17090ae98f00b0029717fb4d79mr101708pjy.2.1708639256048; Thu, 22 Feb 2024 14:00:56 -0800 (PST) Received: from www.outflux.net ([198.0.35.241]) by smtp.gmail.com with ESMTPSA id z19-20020a17090acb1300b00296e2434e7esm12555123pjt.53.2024.02.22.14.00.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 14:00:54 -0800 (PST) From: Kees Cook To: Tycho Andersen Cc: Kees Cook , "Tobin C. Harding" , linux-hardening@vger.kernel.org, Greg Kroah-Hartman , Guixiong Wei , linux-kernel@vger.kernel.org Subject: [PATCH v2 3/4] leaking_addresses: Ignore input device status lines Date: Thu, 22 Feb 2024 14:00:50 -0800 Message-Id: <20240222220053.1475824-3-keescook@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240222215755.it.764-kees@kernel.org> References: <20240222215755.it.764-kees@kernel.org> Precedence: bulk X-Mailing-List: linux-hardening@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3371; i=keescook@chromium.org; h=from:subject; bh=UGxgHq7SGP8k5JaOrHY0DZqOtzZutiNCD5ult3MMLBE=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBl18QTepsFkxDUunQkauTY9LXl/JFwdo6t+IYy0 EMBYfndTweJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZdfEEwAKCRCJcvTf3G3A JnjMD/9yj39MZOjlEWxLkUIX/oXvqJMpGF2DoPIdz9/TS7bx9UjR3LCLoODWqkCnMrlzZJXv0Oe 1UMUwpCnebB8xkbHXRWVMS/Trqpct+hMHW5BcTDzCPa6k3/f5mNIi1McaCwn8GPOjGK2sGMYHBc kzJp8uW5a1kO7Qlj3BWzi9H7vehUf2olWjn7lwLZsQFQPtaMWEEgjvfgdNV/HV4EUdplSPue8KZ 2qA3HNR+Pwo3qNsaz3rMw5yTM1wHK/AmgcPpnnmejB/MJ7DStG4o1xIaN+jIKV8AlESI2K8/OhJ +wV13iKTocEFZLjnGkfYN2MBcrOwCLZGBmK8gofm5lTvFw8wSkpPMPPUhc9+lccM4bfd3a5pwJN TwwaS20rYLSbnk08V5+Bx72SQ4cyYwqb6OQthxH8VqZF40vmlwu7Y0SPC1wTGlWDlBcWKXdVcnZ S1IwH67y/0MMbNJjqf8P2NWIl0SpoMILxBtGV2B6tzqUxuY2lJTTGNpv/1PNkC9hNOT4SD/+xqr M0ZJClQciikw3Tx31XnjPYOi4SSfr2vGip/ohsMVMMGWzqwVJe8kEnUF4WkDzU9nzXBDwKNOatm auwhPRF49kzemOIeLhzX2GpMO4o3DJn6VeZxqEQCu6ahfpc6KsHkuI8f//D8hV1RFzGPIIzPlzK enNnq/xE8BfARww== X-Developer-Key: i=keescook@chromium.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 These are false positives from the input subsystem: /proc/bus/input/devices: B: KEY=402000000 3803078f800d001 feffffdfffefffff fffffffffffffffe /sys/devices/platform/i8042/serio0/input/input1/uevent: KEY=402000000 3803078f800d001 feffffdfffefffff fffffffffffffffe /sys/devices/platform/i8042/serio0/input/input1/capabilities/key: 402000000 3803078f800d001 feffffdf Pass in the filename for more context and expand the "ignored pattern" matcher to notice these. Signed-off-by: Kees Cook --- Cc: Tycho Andersen Cc: "Tobin C. Harding" Cc: linux-hardening@vger.kernel.org --- scripts/leaking_addresses.pl | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/scripts/leaking_addresses.pl b/scripts/leaking_addresses.pl index dd05fbcf15c5..73cfcc5c8854 100755 --- a/scripts/leaking_addresses.pl +++ b/scripts/leaking_addresses.pl @@ -284,9 +284,10 @@ sub is_false_positive return is_false_positive_32bit($match); } - # 64 bit false positives. - - if ($match =~ '\b(0x)?(f|F){16}\b' or + # Ignore 64 bit false positives: + # 0xfffffffffffffff[0-f] + # 0x0000000000000000 + if ($match =~ '\b(0x)?(f|F){15}[0-9a-f]\b' or $match =~ '\b(0x)?0{16}\b') { return 1; } @@ -303,7 +304,7 @@ sub is_false_positive_32bit my ($match) = @_; state $page_offset = get_page_offset(); - if ($match =~ '\b(0x)?(f|F){8}\b') { + if ($match =~ '\b(0x)?(f|F){7}[0-9a-f]\b') { return 1; } @@ -346,18 +347,23 @@ sub is_in_vsyscall_memory_region # True if argument potentially contains a kernel address. sub may_leak_address { - my ($line) = @_; + my ($path, $line) = @_; my $address_re; - # Signal masks. + # Ignore Signal masks. if ($line =~ '^SigBlk:' or $line =~ '^SigIgn:' or $line =~ '^SigCgt:') { return 0; } - if ($line =~ '\bKEY=[[:xdigit:]]{14} [[:xdigit:]]{16} [[:xdigit:]]{16}\b' or - $line =~ '\b[[:xdigit:]]{14} [[:xdigit:]]{16} [[:xdigit:]]{16}\b') { + # Ignore input device reporting. + # /proc/bus/input/devices: B: KEY=402000000 3803078f800d001 feffffdfffefffff fffffffffffffffe + # /sys/devices/platform/i8042/serio0/input/input1/uevent: KEY=402000000 3803078f800d001 feffffdfffefffff fffffffffffffffe + # /sys/devices/platform/i8042/serio0/input/input1/capabilities/key: 402000000 3803078f800d001 feffffdfffefffff fffffffffffffffe + if ($line =~ '\bKEY=[[:xdigit:]]{9,14} [[:xdigit:]]{16} [[:xdigit:]]{16}\b' or + ($path =~ '\bkey$' and + $line =~ '\b[[:xdigit:]]{9,14} [[:xdigit:]]{16} [[:xdigit:]]{16}\b')) { return 0; } @@ -400,7 +406,7 @@ sub parse_dmesg { open my $cmd, '-|', 'dmesg'; while (<$cmd>) { - if (may_leak_address($_)) { + if (may_leak_address("dmesg", $_)) { print 'dmesg: ' . $_; } } @@ -456,7 +462,7 @@ sub parse_file open my $fh, "<", $file or return; while ( <$fh> ) { chomp; - if (may_leak_address($_)) { + if (may_leak_address($file, $_)) { printf("$file: $_\n"); } } @@ -468,7 +474,7 @@ sub check_path_for_leaks { my ($path) = @_; - if (may_leak_address($path)) { + if (may_leak_address($path, $path)) { printf("Path name may contain address: $path\n"); } } From patchwork Thu Feb 22 22:00:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 13568185 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DC4F812D21E for ; Thu, 22 Feb 2024 22:00:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708639261; cv=none; b=kKIt2iq/SgjluxEpNUdAyjlnCglpOc6rfxJoS8twrpedkNHHMIO8SDtLurWbpMLEh2qFkbw17hUF4aiWXgN18KsmU7m53b1vPkVUsqR3OyoyKrthIVCtu+JLbjB5RiuRquMmGZBbBzhgq8gUH5MOH29wpwx2j4QK4ERsRDSTSlk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708639261; c=relaxed/simple; bh=ZM2GR6IBtwz0kQ9xgCjrTuxbIaOuzN6JpSMqdXS7f9k=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=GkXBSFE/WauJRGMsRS88cW7gDCFUJxRwzjziTwwsyqHI3tCVM8m6Oy017112TWwgzPSdk7w0i4QIChxEkJev2alxWZLpS2VDPSim7GbHBATu/79mQCiGqy95UZIwyHwWc2pbhqSsMr6oWQ3OGUDs5GWasKxmJN6p/zrN4M/nLOI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=ZhiddbWa; arc=none smtp.client-ip=209.85.214.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="ZhiddbWa" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-1dba94f9201so2589125ad.0 for ; Thu, 22 Feb 2024 14:00:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1708639255; x=1709244055; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xe2gLkj39s2Uoixf+agRWlsso1N0pC35kqHZ8X47pOU=; b=ZhiddbWahVMWtvB/rz/K+UZHACbjzHHGxkuQFvwrLlK/goGZmLWHuuZb0QODgXUUM8 M3860+sM4Vhfa39xhF/lw9tcJvFVRiuHjjZ8MMampG6zh3JpLSdlYbqVsuFdvr43o3L2 u9SW0ydQziNCrbawdW7hlYKjrvPVw/sX8hWRA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708639255; x=1709244055; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xe2gLkj39s2Uoixf+agRWlsso1N0pC35kqHZ8X47pOU=; b=iwaczm+Ng3+WCeRkPSJAgJ+r1NOlbMPdVQBcxOknuVOmEt6zd1V1Hjt3R+HOhr9kkM zqMqmzk0t90Gt2OJQa0D7P22VS0LWkJ/J6byk1o0tOhompOAwq35ap1A/NdiezvCkczE YkulO4/EmWxvHNBQYKZH5OtrXQENhxJxjy3zOWuzvcNV7qJ8VtzCQwQUgh/4L1p3rV3r kWDeNsqlrea19b21r6HO8wN6KAEq5xP/In8ViR5BS+T/pXbvBW01DSl3N9PZjHZeIbOj wYAsvyOoD6hvnN6561y7othJ0H7SZcGRX1nreL4/1JpqlwvPIxRDqrbpWR8rM+NbZsxp J7+g== X-Forwarded-Encrypted: i=1; AJvYcCXEmxWFftFdHs2hoPfrZInwhnZBS0v1B1JghmApmw19TqFBgqR/sA0xOwVh4A68RwbXT1Tuh5rqGXY5ToiV6ZnUqs7KpppIJbRSXSqbFhD+ X-Gm-Message-State: AOJu0YyuE8rtTf+Vkk2a8RZ9+zaAdMF40YjG73jywj0iGs+OWGJuK41D pN3bVK/6TM5J/jCXif7RxtZZ3cY0oxbFv82bZXFTKNP0RaGO2ZMiwWGgRytCllnU2Zz3u9ALT5s = X-Google-Smtp-Source: AGHT+IHLoJ6j4MLYboXYihdrpaCgY53S5xqzDgny9A2xvBVNtQjVuQKuNHqG4IUCUAX7D0T4anbODw== X-Received: by 2002:a17:902:f690:b0:1db:e9ea:31 with SMTP id l16-20020a170902f69000b001dbe9ea0031mr136788plg.62.1708639255087; Thu, 22 Feb 2024 14:00:55 -0800 (PST) Received: from www.outflux.net ([198.0.35.241]) by smtp.gmail.com with ESMTPSA id q18-20020a170902c9d200b001db9d2c1874sm10441463pld.29.2024.02.22.14.00.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 14:00:54 -0800 (PST) From: Kees Cook To: Tycho Andersen Cc: Kees Cook , Greg Kroah-Hartman , "Tobin C. Harding" , Guixiong Wei , linux-hardening@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/4] leaking_addresses: Provide mechanism to scan binary files Date: Thu, 22 Feb 2024 14:00:51 -0800 Message-Id: <20240222220053.1475824-4-keescook@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240222215755.it.764-kees@kernel.org> References: <20240222215755.it.764-kees@kernel.org> Precedence: bulk X-Mailing-List: linux-hardening@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3757; i=keescook@chromium.org; h=from:subject; bh=ZM2GR6IBtwz0kQ9xgCjrTuxbIaOuzN6JpSMqdXS7f9k=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBl18QTRS+OtPCzXuU3K6f0NRCmSrNpfZm2QSXVK vx4OP/dXYWJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZdfEEwAKCRCJcvTf3G3A JnYhD/95iRSTT8PrBCec5gNuggTGafSw4zAl7bfV4degmG5Ys3xBX/fiYw7IYq9ewTeT2l6TwmC zN5t7qF0GMvCgFG5loC0zmyhrPmM5A/FqeuBsR02nSJgA2OMagymx4uHYclFUlDsKICsPfUKpm4 LtA0T8KCdB9qkmf+k+yqYfP/CQDJVY8bVkegNoc7U9WbSME94EAIDXQe1yZz9F55/bwOUPtci+X R55bhbhgxacEm+i2299Pl5WruZ7YDAcHVYXp/tMAXowh7gGqhZYFstwIl2Cf1YKBfF31LSt4KXz ahC/wRGevY09cLB0cGNusBlSypdD3/i+NPRLxL3QZ+/q4CLnsq9qKitVrCzSE/xC2HqtkVasQGm 0Ju++VXbp18k2ydPKN40po7JQp3zofvqyD0TQCAnb8wsojY9RnFhwewgKXu78tZrO0gtyZtgWwx tDMiAT14TNl3NBv7Omrxmx+M+8oDliUXUD3ODZqkglCggskDHkLfgO4HLQlLbvDi2SEvDsTDZip ZzgNKpEdBdArv7qWxf4VGELv/aSVnl+w7THW8Y/3l+pqufGutRKEfCd45podywPcuphq+SWSizr lNlwM/LCYVOCVAtCIJCuOdZwzd/hkpvj1WWMf8Ggc/N3xxWSTEllF5UBOtc18k7Bn8bm9TQJgTh dH5AIHLCd39ufpg== X-Developer-Key: i=keescook@chromium.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 Introduce --kallsyms argument for scanning binary files for known symbol addresses. This would have found the exposure in /sys/kernel/notes: $ scripts/leaking_addresses.pl --kallsyms=<(sudo cat /proc/kallsyms) /sys/kernel/notes: hypercall_page @ 156 /sys/kernel/notes: xen_hypercall_set_trap_table @ 156 /sys/kernel/notes: startup_xen @ 132 Acked-by: Greg Kroah-Hartman Signed-off-by: Kees Cook --- Cc: "Tobin C. Harding" Cc: Tycho Andersen Cc: Guixiong Wei Cc: linux-hardening@vger.kernel.org --- scripts/leaking_addresses.pl | 53 ++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/scripts/leaking_addresses.pl b/scripts/leaking_addresses.pl index 73cfcc5c8854..8e992b18bcd9 100755 --- a/scripts/leaking_addresses.pl +++ b/scripts/leaking_addresses.pl @@ -52,10 +52,13 @@ my $input_raw = ""; # Read raw results from file instead of scanning. my $suppress_dmesg = 0; # Don't show dmesg in output. my $squash_by_path = 0; # Summary report grouped by absolute path. my $squash_by_filename = 0; # Summary report grouped by filename. +my $kallsyms_file = ""; # Kernel symbols file. my $kernel_config_file = ""; # Kernel configuration file. my $opt_32bit = 0; # Scan 32-bit kernel. my $page_offset_32bit = 0; # Page offset for 32-bit kernel. +my @kallsyms = (); + # Skip these absolute paths. my @skip_abs = ( '/proc/kmsg', @@ -96,6 +99,8 @@ Options: --squash-by-path Show one result per unique path. --squash-by-filename Show one result per unique filename. --kernel-config-file= Kernel configuration file (e.g /boot/config) + --kallsyms= Read kernel symbol addresses from file (for + scanning binary files). --32-bit Scan 32-bit kernel. --page-offset-32-bit=o Page offset (for 32-bit kernel 0xABCD1234). -d, --debug Display debugging output. @@ -116,6 +121,7 @@ GetOptions( 'squash-by-path' => \$squash_by_path, 'squash-by-filename' => \$squash_by_filename, 'raw' => \$raw, + 'kallsyms=s' => \$kallsyms_file, 'kernel-config-file=s' => \$kernel_config_file, '32-bit' => \$opt_32bit, 'page-offset-32-bit=o' => \$page_offset_32bit, @@ -156,6 +162,25 @@ if ($output_raw) { select $fh; } +if ($kallsyms_file) { + open my $fh, '<', $kallsyms_file or die "$0: $kallsyms_file: $!\n"; + while (<$fh>) { + chomp; + my @entry = split / /, $_; + my $addr_text = $entry[0]; + if ($addr_text !~ /^0/) { + # TODO: Why is hex() so impossibly slow? + my $addr = hex($addr_text); + my $symbol = $entry[2]; + # Only keep kernel text addresses. + my $long = pack("J", $addr); + my $entry = [$long, $symbol]; + push @kallsyms, $entry; + } + } + close $fh; +} + parse_dmesg(); walk(@DIRS); @@ -447,6 +472,25 @@ sub timed_parse_file } } +sub parse_binary +{ + my ($file) = @_; + + open my $fh, "<:raw", $file or return; + local $/ = undef; + my $bytes = <$fh>; + close $fh; + + foreach my $entry (@kallsyms) { + my $addr = $entry->[0]; + my $symbol = $entry->[1]; + my $offset = index($bytes, $addr); + if ($offset != -1) { + printf("$file: $symbol @ $offset\n"); + } + } +} + sub parse_file { my ($file) = @_; @@ -456,6 +500,15 @@ sub parse_file } if (! -T $file) { + if ($file =~ m|^/sys/kernel/btf/| or + $file =~ m|^/sys/devices/pci| or + $file =~ m|^/sys/firmware/efi/efivars/| or + $file =~ m|^/proc/bus/pci/|) { + return; + } + if (scalar @kallsyms > 0) { + parse_binary($file); + } return; }