From patchwork Mon May 6 15:55:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 13655675 Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) (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 1833715572E for ; Mon, 6 May 2024 15:55:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715010958; cv=none; b=VbmHCqEK5rBqLFgPhYMPwFdUZLvhvIqO4KlsnopTk+DW6LjIm1xp+zgJKREEPOp0g0cCnaRECj/RK2QfprgWV5Lf2JloMWtdGUG6ac5yP1AfkSTQhmiImrxNccyMWuhpjVN84FhgqfYWTcRkUEE9MJPXSiQ9TXdpuAaeRcGdryA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715010958; c=relaxed/simple; bh=GGxtgdueDnkD++VTZpy2fAe4IiDXfria7dwMnH/Xvds=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=CmV40LWin79TSeNi71+JMliYwtMk7bXVoeaeH5PUEPat768Y8+sJUthd4XCBw54gbI5mW6oNS7Xg9RMwLuDT0UHlPAbc0zP85wWLO8iaYpmIMKoVPGUDN8tm2K8WgJdu6nuRoJqAU0k/rCi/FqwcSA81UGXpLAPq2WoOKCmC56o= 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=Ww++e+vg; arc=none smtp.client-ip=209.85.210.177 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="Ww++e+vg" Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-6f467fb2e66so1469151b3a.1 for ; Mon, 06 May 2024 08:55:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1715010956; x=1715615756; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=sDRDF8JT98zd81UBJ0k3A5WdQ6sY0FvfJJ+osF1311Q=; b=Ww++e+vgZtK0UbvZ/1H3oWkf38o/l1kFFdaIqygCJqAJPMf3Qyc4X1iN2/k6txm7LA noSjnSYCZV0/q1iu0RNmAirqy7FNc8Rg1579jNGsOTOoqyp2AFOoinznOwxx3mhf9mpY DMQFVYuqfZDE2s4Ltp3weiWnKejbrypespMf0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715010956; x=1715615756; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=sDRDF8JT98zd81UBJ0k3A5WdQ6sY0FvfJJ+osF1311Q=; b=rlSkgtHelTeslEo58uJfFhZ/K/iAKv0VN5lRn/gJXDg2zcl6wwfGVezRXXOajGBTNt 2mw5FkttzF7iRjPcXWFmHRzXZSBb6Aj2yOdCF4uQgjE/I25jySUOYE4fZr3FvbWrrrhp l3jolfoi+rn5OHrn0Nnly/h1j1ASkBREvYi0PtYSwWWfELu8B4SOi9/Lzime/DX0HSkM PDQinciZS+hZxnE4zt9vb3T8EtxD4f3jH4pDJ5lxNVByzM6SPHnhUReYZFBhTNFI+JYf fqtA3UKXeJu/9vA486+eEEUalg/stkowOMFYczhCpMAwNON85g5k+6GXQFJMAi4mPvoz oFxw== X-Forwarded-Encrypted: i=1; AJvYcCWWDdxAWiDkH7y4d1J8gRbre8YDriVEsBLrlTgn9meWidhUeKiTBDwGPqv+QEf9pa/fJMb2vgVwEK/7fFc2o1h+XYyXlsxrY2R4NzEqvvsZ X-Gm-Message-State: AOJu0YyTGE9BLUXl5zb3J+70BxA9olAYsgxvwlavv4hMWi5LFA4tbZIt 1tGNGAuGCRrkJeLnDTYegJQYELoQG6bTDB4x6k7KSLhISoqRX4R8DcL2VfHnlA== X-Google-Smtp-Source: AGHT+IF8seK1eV0WOFQ9oIJEm6z+Hw9NQTFIySMgMWTXXYqt4+1a9w/894yC/hdv+9bzowoZqhikHg== X-Received: by 2002:a05:6a21:2787:b0:1af:baf9:fef6 with SMTP id rn7-20020a056a21278700b001afbaf9fef6mr875194pzb.16.1715010956221; Mon, 06 May 2024 08:55:56 -0700 (PDT) Received: from www.outflux.net ([198.0.35.241]) by smtp.gmail.com with ESMTPSA id s8-20020a056a0008c800b006f46e3b1d03sm3052566pfu.88.2024.05.06.08.55.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 08:55:55 -0700 (PDT) From: Kees Cook To: Josh Poimboeuf Cc: Kees Cook , Peter Zijlstra , linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org Subject: [PATCH v2] objtool: Report section name in elf_init_reloc_text_sym() warning Date: Mon, 6 May 2024 08:55:54 -0700 Message-Id: <20240506155537.it.760-kees@kernel.org> X-Mailer: git-send-email 2.34.1 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=1385; i=keescook@chromium.org; h=from:subject:message-id; bh=GGxtgdueDnkD++VTZpy2fAe4IiDXfria7dwMnH/Xvds=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBmOP2Kj5waKn0Rom7MjuZCKgUTYCB/8plgHDYgu 39RuxQNIGKJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZjj9igAKCRCJcvTf3G3A JsdsD/9XOz3kYzfScqtBwJzrTbArfUb/4ag/iIi+uY/twr+UWJYIZJ6X0E57SAbZqdtFx3lvAmu 7eDimxhxNAx47XzNTrjG9eospdV5PUPkKpl76Y6MyU1zLpxqmDiQf1u33AXex2std12cG4Zy4zI YHjEOxeWXboPe88GFCOCu35n/dBnseQEPefB7w5IZk8BRi8XEU+QmR+pVdJIcOwTy5XbLgj5JeP QYTDlhn5RVcrvux2Ik7EwEWQrIauFadGZRVolS6uvRG+9cmQhVe5PIFK3tmIGKQi7UwJLzyXaGt hnbh0ueDHEs0rCnNVPtgAYkGvWGKhc8VDYm/C+Xz7NLXNERqpHjAHOf9QBTh9RZqPWmM6DYfjh1 ghap7NR9buzGq0wvb5UcdxjnpFKvVVGLv9YMHJUqzXQfdovnpB8tq7qMY0Z/s5aB1P8O73Uol6g LuVVOSSFImtTHK+BMw/fZtHa/r+fhaKSkaHvw9GwyIdfTnQw73AP/k5fuz+NWE0YfYrv1VBbT4o f1A+kpfdCVYbE9YMtDncBjvl0nJrHPlUao/c18QiX0pParCsbiGrDPzGNx2JblXQ+N2munjBigt BvBz/Xd3CWo2DIOKQWss01le5WPbogV3HqcHX6mLC/1qSK+kYbI6b2iaUqyCybTiJiwyLXn4QVF ASAbC8i zzoA1F0w== X-Developer-Key: i=keescook@chromium.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 While tracking down issues with LKDTM's .rodata "function", I found the warning from elf_init_reloc_text_sym() to be unhelpful because it wasn't clear which calling path it was coming from. Report the sec->name and rephrase the warning a bit. Additionally check for NULL sym->name, which may happen. Before: vmlinux.o: warning: objtool: bad call to elf_init_reloc_text_sym() for data symbol .rodata After: vmlinux.o: warning: objtool: .cfi_sites: unexpected reference to non-executable symbol '.rodata' Signed-off-by: Kees Cook --- Cc: Josh Poimboeuf Cc: Peter Zijlstra v1: https://lore.kernel.org/lkml/20240430235106.work.680-kees@kernel.org/ --- tools/objtool/elf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c index 3d27983dc908..b38cedd4fd55 100644 --- a/tools/objtool/elf.c +++ b/tools/objtool/elf.c @@ -891,8 +891,8 @@ struct reloc *elf_init_reloc_text_sym(struct elf *elf, struct section *sec, int addend = insn_off; if (!(insn_sec->sh.sh_flags & SHF_EXECINSTR)) { - WARN("bad call to %s() for data symbol %s", - __func__, sym->name); + WARN("%s: unexpected reference to non-executable symbol '%s'", + sec->name, sym->name ?: ""); return NULL; }