Changes in 5.4.59
tracepoint: Mark __tracepoint_string's __used
HID: input: Fix devices that return multiple bytes in battery report
nvme: add a Identify Namespace Identification Descriptor list quirk
fs/io_uring.c: Fix uninitialized variable is referenced in io_submit_sqe
clk: qcom: clk-rpmh: Wait for completion when enabling clocks
x86/mce/inject: Fix a wrong assignment of i_mce.status
sched/fair: Fix NOHZ next idle balance
sched: correct SD_flags returned by tl->sd_flags()
arm64: dts: rockchip: fix rk3368-lion gmac reset gpio
arm64: dts: rockchip: fix rk3399-puma vcc5v0-host gpio
arm64: dts: rockchip: fix rk3399-puma gmac reset gpio
EDAC: Fix reference count leaks
crc-t10dif: Fix potential crypto notify dead-lock
arm64: dts: qcom: msm8916: Replace invalid bias-pull-none property
blktrace: fix debugfs use after free
crypto: ccree - fix resource leak on error path
ARM: exynos: MCPM: Restore big.LITTLE cpuidle support
firmware: arm_scmi: Fix SCMI genpd domain probing
arm64: dts: exynos: Fix silent hang after boot on Espresso
sched/uclamp: Fix initialization of struct uclamp_rq
clk: scmi: Fix min and max rate when registering clocks with discrete rates
m68k: mac: Don't send IOP message until channel is idle
m68k: mac: Fix IOP status/control register writes
platform/x86: intel-hid: Fix return value check in check_acpi_dev()
platform/x86: intel-vbtn: Fix return value check in check_acpi_dev()
ARM: dts: gose: Fix ports node name for adv7180
ARM: dts: gose: Fix ports node name for adv7612
ARM: at91: pm: add missing put_device() call in at91_pm_sram_init()
ARM: dts: sunxi: bananapi-m2-plus-v1.2: Add regulator supply to all CPU cores
ARM: dts: sunxi: bananapi-m2-plus-v1.2: Fix CPU supply voltages
spi: lantiq: fix: Rx overflow error in full duplex mode
tpm: Require that all digests are present in TCG_PCR_EVENT2 structures
recordmcount: only record relocation of type R_AARCH64_CALL26 on arm64.
regulator: fix memory leak on error path of regulator_register()
io_uring: fix sq array offset calculation
spi: rockchip: Fix error in SPI slave pio read
ARM: socfpga: PM: add missing put_device() call in socfpga_setup_ocram_self_refresh()
iocost: Fix check condition of iocg abs_vdebt
irqchip/ti-sci-inta: Fix return value about devm_ioremap_resource()
seccomp: Fix ioctl number for SECCOMP_IOCTL_NOTIF_ID_VALID
md: raid0/linear: fix dereference before null check on pointer mddev
nvme-tcp: fix controller reset hang during traffic
nvme-rdma: fix controller reset hang during traffic
nvme-multipath: fix logic for non-optimized paths
nvme-multipath: do not fall back to __nvme_find_path() for non-optimized paths
drm/tilcdc: fix leak & null ref in panel_connector_get_modes
soc: qcom: rpmh-rsc: Set suppress_bind_attrs flag
Bluetooth: add a mutex lock to avoid UAF in do_enale_set
loop: be paranoid on exit and prevent new additions / removals
fs/btrfs: Add cond_resched() for try_release_extent_mapping() stalls
drm/amdgpu: avoid dereferencing a NULL pointer
drm/radeon: Fix reference count leaks caused by pm_runtime_get_sync
crypto: aesni - Fix build with LLVM_IAS=1
video: fbdev: savage: fix memory leak on error handling path in probe
video: fbdev: neofb: fix memory leak in neo_scan_monitor()
bus: ti-sysc: Add missing quirk flags for usb_host_hs
md-cluster: fix wild pointer of unlock_all_bitmaps()
drm/nouveau/kms/nv50-: Fix disabling dithering
arm64: dts: hisilicon: hikey: fixes to comply with adi, adv7533 DT binding
drm/etnaviv: fix ref count leak via pm_runtime_get_sync
drm/nouveau: fix reference count leak in nouveau_debugfs_strap_peek
drm/nouveau: fix multiple instances of reference count leaks
mmc: sdhci-cadence: do not use hardware tuning for SD mode
btrfs: fix lockdep splat from btrfs_dump_space_info
usb: mtu3: clear dual mode of u3port when disable device
drm: msm: a6xx: fix gpu failure after system resume
drm/msm: Fix a null pointer access in msm_gem_shrinker_count()
drm/debugfs: fix plain echo to connector "force" attribute
drm/radeon: disable AGP by default
irqchip/irq-mtk-sysirq: Replace spinlock with raw_spinlock
mm/mmap.c: Add cond_resched() for exit_mmap() CPU stalls
drm/amdgpu/display bail early in dm_pp_get_static_clocks
drm/amd/powerplay: fix compile error with ARCH=arc
bpf: Fix fds_example SIGSEGV error
brcmfmac: keep SDIO watchdog running when console_interval is non-zero
brcmfmac: To fix Bss Info flag definition Bug
brcmfmac: set state of hanger slot to FREE when flushing PSQ
platform/x86: asus-nb-wmi: add support for ASUS ROG Zephyrus G14 and G15
iwlegacy: Check the return value of pcie_capability_read_*()
gpu: host1x: debug: Fix multiple channels emitting messages simultaneously
ionic: update eid test for overflow
mmc: sdhci-pci-o2micro: Bug fix for O2 host controller Seabird1
usb: gadget: net2280: fix memory leak on probe error handling paths
bdc: Fix bug causing crash after multiple disconnects
usb: bdc: Halt controller on suspend
dyndbg: fix a BUG_ON in ddebug_describe_flags
bcache: fix super block seq numbers comparision in register_cache_set()
ACPICA: Do not increment operation_region reference counts for field units
drm/msm: ratelimit crtc event overflow error
drm/gem: Fix a leak in drm_gem_objects_lookup()
drm/bridge: ti-sn65dsi86: Clear old error bits before AUX transfers
agp/intel: Fix a memory leak on module initialisation failure
mwifiex: Fix firmware filename for sd8977 chipset
mwifiex: Fix firmware filename for sd8997 chipset
btmrvl: Fix firmware filename for sd8977 chipset
btmrvl: Fix firmware filename for sd8997 chipset
video: fbdev: sm712fb: fix an issue about iounmap for a wrong address
console: newport_con: fix an issue about leak related system resources
video: pxafb: Fix the function used to balance a 'dma_alloc_coherent()' call
ath10k: Acquire tx_lock in tx error paths
iio: improve IIO_CONCENTRATION channel type description
drm/etnaviv: Fix error path on failure to enable bus clk
drm/arm: fix unintentional integer overflow on left shift
clk: bcm63xx-gate: fix last clock availability
leds: lm355x: avoid enum conversion warning
Bluetooth: btusb: fix up firmware download sequence
Bluetooth: btmtksdio: fix up firmware download sequence
media: cxusb-analog: fix V4L2 dependency
media: marvell-ccic: Add missed v4l2_async_notifier_cleanup()
media: omap3isp: Add missed v4l2_ctrl_handler_free() for preview_init_entities()
ASoC: SOF: nocodec: add missing .owner field
ASoC: Intel: bxt_rt298: add missing .owner field
scsi: cumana_2: Fix different dev_id between request_irq() and free_irq()
drm/mipi: use dcs write for mipi_dsi_dcs_set_tear_scanline
cxl: Fix kobject memleak
drm/radeon: fix array out-of-bounds read and write issues
staging: vchiq_arm: Add a matching unregister call
iavf: fix error return code in iavf_init_get_resources()
iavf: Fix updating statistics
RDMA/core: Fix bogus WARN_ON during ib_unregister_device_queued()
scsi: powertec: Fix different dev_id between request_irq() and free_irq()
scsi: eesox: Fix different dev_id between request_irq() and free_irq()
ipvs: allow connection reuse for unconfirmed conntrack
media: firewire: Using uninitialized values in node_probe()
media: exynos4-is: Add missed check for pinctrl_lookup_state()
media: cros-ec-cec: do not bail on device_init_wakeup failure
xfs: don't eat an EIO/ENOSPC writeback error when scrubbing data fork
xfs: fix reflink quota reservation accounting error
RDMA/rxe: Skip dgid check in loopback mode
PCI: Fix pci_cfg_wait queue locking problem
drm/stm: repair runtime power management
kobject: Avoid premature parent object freeing in kobject_cleanup()
leds: core: Flush scheduled work for system suspend
drm: panel: simple: Fix bpc for LG LB070WV8 panel
phy: exynos5-usbdrd: Calibrating makes sense only for USB2.0 PHY
drm/bridge: sil_sii8620: initialize return of sii8620_readb
scsi: scsi_debug: Add check for sdebug_max_queue during module init
mwifiex: Prevent memory corruption handling keys
kernfs: do not call fsnotify() with name without a parent
powerpc/rtas: don't online CPUs for partition suspend
powerpc/vdso: Fix vdso cpu truncation
RDMA/qedr: SRQ's bug fixes
RDMA/rxe: Prevent access to wr->next ptr afrer wr is posted to send queue
ima: Have the LSM free its audit rule
staging: rtl8192u: fix a dubious looking mask before a shift
ASoC: meson: fixes the missed kfree() for axg_card_add_tdm_loopback
PCI/ASPM: Add missing newline in sysfs 'policy'
phy: renesas: rcar-gen3-usb2: move irq registration to init
powerpc/book3s64/pkeys: Use PVR check instead of cpu feature
drm/imx: fix use after free
drm/imx: tve: fix regulator_disable error path
gpu: ipu-v3: Restore RGB32, BGR32
spi: lantiq-ssc: Fix warning by using WQ_MEM_RECLAIM
USB: serial: iuu_phoenix: fix led-activity helpers
usb: core: fix quirks_param_set() writing to a const pointer
thermal: ti-soc-thermal: Fix reversed condition in ti_thermal_expose_sensor()
coresight: tmc: Fix TMC mode read in tmc_read_unprepare_etb()
powerpc/perf: Fix missing is_sier_aviable() during build
mt76: mt7615: fix potential memory leak in mcu message handler
phy: armada-38x: fix NETA lockup when repeatedly switching speeds
MIPS: OCTEON: add missing put_device() call in dwc3_octeon_device_init()
usb: dwc2: Fix error path in gadget registration
usb: gadget: f_uac2: fix AC Interface Header Descriptor wTotalLength
scsi: megaraid_sas: Clear affinity hint
scsi: mesh: Fix panic after host or bus reset
net: dsa: mv88e6xxx: MV88E6097 does not support jumbo configuration
macintosh/via-macii: Access autopoll_devs when inside lock
PCI: cadence: Fix updating Vendor ID and Subsystem Vendor ID register
RDMA/core: Fix return error value in _ib_modify_qp() to negative
Smack: fix another vsscanf out of bounds
Smack: prevent underflow in smk_set_cipso()
power: supply: check if calc_soc succeeded in pm860x_init_battery
Bluetooth: hci_h5: Set HCI_UART_RESET_ON_INIT to correct flags
Bluetooth: hci_serdev: Only unregister device if it was registered
net: dsa: rtl8366: Fix VLAN semantics
net: dsa: rtl8366: Fix VLAN set-up
xfs: fix inode allocation block res calculation precedence
selftests/powerpc: Squash spurious errors due to device removal
powerpc/32s: Fix CONFIG_BOOK3S_601 uses
powerpc/boot: Fix CONFIG_PPC_MPC52XX references
selftests/powerpc: Fix CPU affinity for child process
RDMA/netlink: Remove CAP_NET_RAW check when dump a raw QP
PCI: Release IVRS table in AMD ACS quirk
cpufreq: ap806: fix cpufreq driver needs ap cpu clk
selftests/powerpc: Fix online CPU selection
ASoC: meson: axg-tdm-interface: fix link fmt setup
ASoC: meson: axg-tdmin: fix g12a skew
ASoC: meson: axg-tdm-formatters: fix sclk inversion
ASoC: fsl_sai: Fix value of FSL_SAI_CR1_RFW_MASK
s390/qeth: don't process empty bridge port events
ice: Graceful error handling in HW table calloc failure
rtw88: fix LDPC field for RA info
rtw88: fix short GI capability based on current bandwidth
rtw88: coex: only skip coex triggered by BT info
wl1251: fix always return 0 error
tools, build: Propagate build failures from tools/build/Makefile.build
tools, bpftool: Fix wrong return value in do_dump()
net/mlx5: DR, Change push vlan action sequence
net/mlx5: Delete extra dump stack that gives nothing
net: ethernet: aquantia: Fix wrong return value
liquidio: Fix wrong return value in cn23xx_get_pf_num()
net: spider_net: Fix the size used in a 'dma_free_coherent()' call
fsl/fman: use 32-bit unsigned integer
fsl/fman: fix dereference null return value
fsl/fman: fix unreachable code
fsl/fman: check dereferencing null pointer
fsl/fman: fix eth hash table allocation
net: thunderx: initialize VF's mailbox mutex before first usage
dlm: Fix kobject memleak
ocfs2: fix unbalanced locking
pinctrl-single: fix pcs_parse_pinconf() return value
svcrdma: Fix page leak in svc_rdma_recv_read_chunk()
SUNRPC: Fix ("SUNRPC: Add "@len" parameter to gss_unwrap()")
x86/fsgsbase/64: Fix NULL deref in 86_fsgsbase_read_task
crypto: aesni - add compatibility with IAS
af_packet: TPACKET_V3: fix fill status rwlock imbalance
drivers/net/wan/lapbether: Added needed_headroom and a skb->len check
net: Fix potential memory leak in proto_register()
net/nfc/rawsock.c: add CAP_NET_RAW check.
net: phy: fix memory leak in device-create error path
net: Set fput_needed iff FDPUT_FPUT is set
net/tls: Fix kmap usage
tcp: correct read of TFO keys on big endian systems
vmxnet3: use correct tcp hdr length when packet is encapsulated
net: refactor bind_bucket fastreuse into helper
net: initialize fastreuse on inet_inherit_port
USB: serial: cp210x: re-enable auto-RTS on open
USB: serial: cp210x: enable usb generic throttle/unthrottle
ALSA: hda - fix the micmute led status for Lenovo ThinkCentre AIO
ALSA: usb-audio: Creative USB X-Fi Pro SB1095 volume knob support
ALSA: usb-audio: fix overeager device match for MacroSilicon MS2109
ALSA: usb-audio: work around streaming quirk for MacroSilicon MS2109
9p: Fix memory leak in v9fs_mount
media: media-request: Fix crash if memory allocation fails
drm/ttm/nouveau: don't call tt destroy callback on alloc failure.
io_uring: set ctx sq/cq entry count earlier
NFS: Don't move layouts to plh_return_segs list while in use
NFS: Don't return layout segments that are in use
cpufreq: Fix locking issues with governors
cpufreq: dt: fix oops on armada37xx
include/asm-generic/vmlinux.lds.h: align ro_after_init
spi: spidev: Align buffers for DMA
mtd: rawnand: qcom: avoid write to unavailable register
erofs: fix extended inode could cross boundary
Revert "parisc: Drop LDCW barrier in CAS code when running UP"
Revert "parisc: Use ldcw instruction for SMP spinlock release barrier"
Revert "parisc: Revert "Release spinlocks using ordered store""
parisc: Do not use an ordered store in pa_tlb_lock()
parisc: Implement __smp_store_release and __smp_load_acquire barriers
parisc: mask out enable and reserved bits from sba imask
ARM: 8992/1: Fix unwind_frame for clang-built kernels
irqdomain/treewide: Free firmware node after domain removal
ALSA: usb-audio: add quirk for Pioneer DDJ-RB
tpm: Unify the mismatching TPM space buffer sizes
pstore: Fix linking when crypto API disabled
crypto: hisilicon - don't sleep of CRYPTO_TFM_REQ_MAY_SLEEP was not specified
crypto: qat - fix double free in qat_uclo_create_batch_init_list
crypto: ccp - Fix use of merged scatterlists
crypto: cpt - don't sleep of CRYPTO_TFM_REQ_MAY_SLEEP was not specified
bitfield.h: don't compile-time validate _val in FIELD_FIT
fs/minix: check return value of sb_getblk()
fs/minix: don't allow getting deleted inodes
fs/minix: reject too-large maximum file size
xen/balloon: fix accounting in alloc_xenballooned_pages error path
xen/balloon: make the balloon wait interruptible
xen/gntdev: Fix dmabuf import with non-zero sgt offset
s390/dasd: fix inability to use DASD with DIAG driver
s390/gmap: improve THP splitting
io_uring: Fix NULL pointer dereference in loop_rw_iter()
Linux 5.4.59
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I4bc685ec9234d8f72a9c66ee2d509a2975f6d711
672 lines
17 KiB
C
672 lines
17 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* recordmcount.c: construct a table of the locations of calls to 'mcount'
|
|
* so that ftrace can find them quickly.
|
|
* Copyright 2009 John F. Reiser <jreiser@BitWagon.com>. All rights reserved.
|
|
*
|
|
* Restructured to fit Linux format, as well as other updates:
|
|
* Copyright 2010 Steven Rostedt <srostedt@redhat.com>, Red Hat Inc.
|
|
*/
|
|
|
|
/*
|
|
* Strategy: alter the .o file in-place.
|
|
*
|
|
* Append a new STRTAB that has the new section names, followed by a new array
|
|
* ElfXX_Shdr[] that has the new section headers, followed by the section
|
|
* contents for __mcount_loc and its relocations. The old shstrtab strings,
|
|
* and the old ElfXX_Shdr[] array, remain as "garbage" (commonly, a couple
|
|
* kilobytes.) Subsequent processing by /bin/ld (or the kernel module loader)
|
|
* will ignore the garbage regions, because they are not designated by the
|
|
* new .e_shoff nor the new ElfXX_Shdr[]. [In order to remove the garbage,
|
|
* then use "ld -r" to create a new file that omits the garbage.]
|
|
*/
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/mman.h>
|
|
#include <sys/stat.h>
|
|
#include <getopt.h>
|
|
#include <elf.h>
|
|
#include <fcntl.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
|
|
#ifndef EM_AARCH64
|
|
#define EM_AARCH64 183
|
|
#define R_AARCH64_NONE 0
|
|
#define R_AARCH64_ABS64 257
|
|
#endif
|
|
|
|
#define R_ARM_PC24 1
|
|
#define R_ARM_THM_CALL 10
|
|
#define R_ARM_CALL 28
|
|
|
|
static int fd_map; /* File descriptor for file being modified. */
|
|
static int mmap_failed; /* Boolean flag. */
|
|
static char gpfx; /* prefix for global symbol name (sometimes '_') */
|
|
static struct stat sb; /* Remember .st_size, etc. */
|
|
static const char *altmcount; /* alternate mcount symbol name */
|
|
static int warn_on_notrace_sect; /* warn when section has mcount not being recorded */
|
|
static void *file_map; /* pointer of the mapped file */
|
|
static void *file_end; /* pointer to the end of the mapped file */
|
|
static int file_updated; /* flag to state file was changed */
|
|
static void *file_ptr; /* current file pointer location */
|
|
|
|
static void *file_append; /* added to the end of the file */
|
|
static size_t file_append_size; /* how much is added to end of file */
|
|
|
|
/* Per-file resource cleanup when multiple files. */
|
|
static void file_append_cleanup(void)
|
|
{
|
|
free(file_append);
|
|
file_append = NULL;
|
|
file_append_size = 0;
|
|
file_updated = 0;
|
|
}
|
|
|
|
static void mmap_cleanup(void)
|
|
{
|
|
if (!mmap_failed)
|
|
munmap(file_map, sb.st_size);
|
|
else
|
|
free(file_map);
|
|
file_map = NULL;
|
|
}
|
|
|
|
/* ulseek, uwrite, ...: Check return value for errors. */
|
|
|
|
static off_t ulseek(off_t const offset, int const whence)
|
|
{
|
|
switch (whence) {
|
|
case SEEK_SET:
|
|
file_ptr = file_map + offset;
|
|
break;
|
|
case SEEK_CUR:
|
|
file_ptr += offset;
|
|
break;
|
|
case SEEK_END:
|
|
file_ptr = file_map + (sb.st_size - offset);
|
|
break;
|
|
}
|
|
if (file_ptr < file_map) {
|
|
fprintf(stderr, "lseek: seek before file\n");
|
|
return -1;
|
|
}
|
|
return file_ptr - file_map;
|
|
}
|
|
|
|
static ssize_t uwrite(void const *const buf, size_t const count)
|
|
{
|
|
size_t cnt = count;
|
|
off_t idx = 0;
|
|
|
|
file_updated = 1;
|
|
|
|
if (file_ptr + count >= file_end) {
|
|
off_t aoffset = (file_ptr + count) - file_end;
|
|
|
|
if (aoffset > file_append_size) {
|
|
file_append = realloc(file_append, aoffset);
|
|
file_append_size = aoffset;
|
|
}
|
|
if (!file_append) {
|
|
perror("write");
|
|
file_append_cleanup();
|
|
mmap_cleanup();
|
|
return -1;
|
|
}
|
|
if (file_ptr < file_end) {
|
|
cnt = file_end - file_ptr;
|
|
} else {
|
|
cnt = 0;
|
|
idx = aoffset - count;
|
|
}
|
|
}
|
|
|
|
if (cnt)
|
|
memcpy(file_ptr, buf, cnt);
|
|
|
|
if (cnt < count)
|
|
memcpy(file_append + idx, buf + cnt, count - cnt);
|
|
|
|
file_ptr += count;
|
|
return count;
|
|
}
|
|
|
|
static void * umalloc(size_t size)
|
|
{
|
|
void *const addr = malloc(size);
|
|
if (addr == 0) {
|
|
fprintf(stderr, "malloc failed: %zu bytes\n", size);
|
|
file_append_cleanup();
|
|
mmap_cleanup();
|
|
return NULL;
|
|
}
|
|
return addr;
|
|
}
|
|
|
|
/*
|
|
* Get the whole file as a programming convenience in order to avoid
|
|
* malloc+lseek+read+free of many pieces. If successful, then mmap
|
|
* avoids copying unused pieces; else just read the whole file.
|
|
* Open for both read and write; new info will be appended to the file.
|
|
* Use MAP_PRIVATE so that a few changes to the in-memory ElfXX_Ehdr
|
|
* do not propagate to the file until an explicit overwrite at the last.
|
|
* This preserves most aspects of consistency (all except .st_size)
|
|
* for simultaneous readers of the file while we are appending to it.
|
|
* However, multiple writers still are bad. We choose not to use
|
|
* locking because it is expensive and the use case of kernel build
|
|
* makes multiple writers unlikely.
|
|
*/
|
|
static void *mmap_file(char const *fname)
|
|
{
|
|
/* Avoid problems if early cleanup() */
|
|
fd_map = -1;
|
|
mmap_failed = 1;
|
|
file_map = NULL;
|
|
file_ptr = NULL;
|
|
file_updated = 0;
|
|
sb.st_size = 0;
|
|
|
|
fd_map = open(fname, O_RDONLY);
|
|
if (fd_map < 0) {
|
|
perror(fname);
|
|
return NULL;
|
|
}
|
|
if (fstat(fd_map, &sb) < 0) {
|
|
perror(fname);
|
|
goto out;
|
|
}
|
|
if (!S_ISREG(sb.st_mode)) {
|
|
fprintf(stderr, "not a regular file: %s\n", fname);
|
|
goto out;
|
|
}
|
|
file_map = mmap(0, sb.st_size, PROT_READ|PROT_WRITE, MAP_PRIVATE,
|
|
fd_map, 0);
|
|
if (file_map == MAP_FAILED) {
|
|
mmap_failed = 1;
|
|
file_map = umalloc(sb.st_size);
|
|
if (!file_map) {
|
|
perror(fname);
|
|
goto out;
|
|
}
|
|
if (read(fd_map, file_map, sb.st_size) != sb.st_size) {
|
|
perror(fname);
|
|
free(file_map);
|
|
file_map = NULL;
|
|
goto out;
|
|
}
|
|
} else
|
|
mmap_failed = 0;
|
|
out:
|
|
close(fd_map);
|
|
fd_map = -1;
|
|
|
|
file_end = file_map + sb.st_size;
|
|
|
|
return file_map;
|
|
}
|
|
|
|
|
|
static unsigned char ideal_nop5_x86_64[5] = { 0x0f, 0x1f, 0x44, 0x00, 0x00 };
|
|
static unsigned char ideal_nop5_x86_32[5] = { 0x3e, 0x8d, 0x74, 0x26, 0x00 };
|
|
static unsigned char *ideal_nop;
|
|
|
|
static char rel_type_nop;
|
|
|
|
static int (*make_nop)(void *map, size_t const offset);
|
|
|
|
static int make_nop_x86(void *map, size_t const offset)
|
|
{
|
|
uint32_t *ptr;
|
|
unsigned char *op;
|
|
|
|
/* Confirm we have 0xe8 0x0 0x0 0x0 0x0 */
|
|
ptr = map + offset;
|
|
if (*ptr != 0)
|
|
return -1;
|
|
|
|
op = map + offset - 1;
|
|
if (*op != 0xe8)
|
|
return -1;
|
|
|
|
/* convert to nop */
|
|
if (ulseek(offset - 1, SEEK_SET) < 0)
|
|
return -1;
|
|
if (uwrite(ideal_nop, 5) < 0)
|
|
return -1;
|
|
return 0;
|
|
}
|
|
|
|
static unsigned char ideal_nop4_arm_le[4] = { 0x00, 0x00, 0xa0, 0xe1 }; /* mov r0, r0 */
|
|
static unsigned char ideal_nop4_arm_be[4] = { 0xe1, 0xa0, 0x00, 0x00 }; /* mov r0, r0 */
|
|
static unsigned char *ideal_nop4_arm;
|
|
|
|
static unsigned char bl_mcount_arm_le[4] = { 0xfe, 0xff, 0xff, 0xeb }; /* bl */
|
|
static unsigned char bl_mcount_arm_be[4] = { 0xeb, 0xff, 0xff, 0xfe }; /* bl */
|
|
static unsigned char *bl_mcount_arm;
|
|
|
|
static unsigned char push_arm_le[4] = { 0x04, 0xe0, 0x2d, 0xe5 }; /* push {lr} */
|
|
static unsigned char push_arm_be[4] = { 0xe5, 0x2d, 0xe0, 0x04 }; /* push {lr} */
|
|
static unsigned char *push_arm;
|
|
|
|
static unsigned char ideal_nop2_thumb_le[2] = { 0x00, 0xbf }; /* nop */
|
|
static unsigned char ideal_nop2_thumb_be[2] = { 0xbf, 0x00 }; /* nop */
|
|
static unsigned char *ideal_nop2_thumb;
|
|
|
|
static unsigned char push_bl_mcount_thumb_le[6] = { 0x00, 0xb5, 0xff, 0xf7, 0xfe, 0xff }; /* push {lr}, bl */
|
|
static unsigned char push_bl_mcount_thumb_be[6] = { 0xb5, 0x00, 0xf7, 0xff, 0xff, 0xfe }; /* push {lr}, bl */
|
|
static unsigned char *push_bl_mcount_thumb;
|
|
|
|
static int make_nop_arm(void *map, size_t const offset)
|
|
{
|
|
char *ptr;
|
|
int cnt = 1;
|
|
int nop_size;
|
|
size_t off = offset;
|
|
|
|
ptr = map + offset;
|
|
if (memcmp(ptr, bl_mcount_arm, 4) == 0) {
|
|
if (memcmp(ptr - 4, push_arm, 4) == 0) {
|
|
off -= 4;
|
|
cnt = 2;
|
|
}
|
|
ideal_nop = ideal_nop4_arm;
|
|
nop_size = 4;
|
|
} else if (memcmp(ptr - 2, push_bl_mcount_thumb, 6) == 0) {
|
|
cnt = 3;
|
|
nop_size = 2;
|
|
off -= 2;
|
|
ideal_nop = ideal_nop2_thumb;
|
|
} else
|
|
return -1;
|
|
|
|
/* Convert to nop */
|
|
if (ulseek(off, SEEK_SET) < 0)
|
|
return -1;
|
|
|
|
do {
|
|
if (uwrite(ideal_nop, nop_size) < 0)
|
|
return -1;
|
|
} while (--cnt > 0);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static unsigned char ideal_nop4_arm64[4] = {0x1f, 0x20, 0x03, 0xd5};
|
|
static int make_nop_arm64(void *map, size_t const offset)
|
|
{
|
|
uint32_t *ptr;
|
|
|
|
ptr = map + offset;
|
|
/* bl <_mcount> is 0x94000000 before relocation */
|
|
if (*ptr != 0x94000000)
|
|
return -1;
|
|
|
|
/* Convert to nop */
|
|
if (ulseek(offset, SEEK_SET) < 0)
|
|
return -1;
|
|
if (uwrite(ideal_nop, 4) < 0)
|
|
return -1;
|
|
return 0;
|
|
}
|
|
|
|
static int write_file(const char *fname)
|
|
{
|
|
char tmp_file[strlen(fname) + 4];
|
|
size_t n;
|
|
|
|
if (!file_updated)
|
|
return 0;
|
|
|
|
sprintf(tmp_file, "%s.rc", fname);
|
|
|
|
/*
|
|
* After reading the entire file into memory, delete it
|
|
* and write it back, to prevent weird side effects of modifying
|
|
* an object file in place.
|
|
*/
|
|
fd_map = open(tmp_file, O_WRONLY | O_TRUNC | O_CREAT, sb.st_mode);
|
|
if (fd_map < 0) {
|
|
perror(fname);
|
|
return -1;
|
|
}
|
|
n = write(fd_map, file_map, sb.st_size);
|
|
if (n != sb.st_size) {
|
|
perror("write");
|
|
close(fd_map);
|
|
return -1;
|
|
}
|
|
if (file_append_size) {
|
|
n = write(fd_map, file_append, file_append_size);
|
|
if (n != file_append_size) {
|
|
perror("write");
|
|
close(fd_map);
|
|
return -1;
|
|
}
|
|
}
|
|
close(fd_map);
|
|
if (rename(tmp_file, fname) < 0) {
|
|
perror(fname);
|
|
return -1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/* w8rev, w8nat, ...: Handle endianness. */
|
|
|
|
static uint64_t w8rev(uint64_t const x)
|
|
{
|
|
return ((0xff & (x >> (0 * 8))) << (7 * 8))
|
|
| ((0xff & (x >> (1 * 8))) << (6 * 8))
|
|
| ((0xff & (x >> (2 * 8))) << (5 * 8))
|
|
| ((0xff & (x >> (3 * 8))) << (4 * 8))
|
|
| ((0xff & (x >> (4 * 8))) << (3 * 8))
|
|
| ((0xff & (x >> (5 * 8))) << (2 * 8))
|
|
| ((0xff & (x >> (6 * 8))) << (1 * 8))
|
|
| ((0xff & (x >> (7 * 8))) << (0 * 8));
|
|
}
|
|
|
|
static uint32_t w4rev(uint32_t const x)
|
|
{
|
|
return ((0xff & (x >> (0 * 8))) << (3 * 8))
|
|
| ((0xff & (x >> (1 * 8))) << (2 * 8))
|
|
| ((0xff & (x >> (2 * 8))) << (1 * 8))
|
|
| ((0xff & (x >> (3 * 8))) << (0 * 8));
|
|
}
|
|
|
|
static uint32_t w2rev(uint16_t const x)
|
|
{
|
|
return ((0xff & (x >> (0 * 8))) << (1 * 8))
|
|
| ((0xff & (x >> (1 * 8))) << (0 * 8));
|
|
}
|
|
|
|
static uint64_t w8nat(uint64_t const x)
|
|
{
|
|
return x;
|
|
}
|
|
|
|
static uint32_t w4nat(uint32_t const x)
|
|
{
|
|
return x;
|
|
}
|
|
|
|
static uint32_t w2nat(uint16_t const x)
|
|
{
|
|
return x;
|
|
}
|
|
|
|
static uint64_t (*w8)(uint64_t);
|
|
static uint32_t (*w)(uint32_t);
|
|
static uint32_t (*w2)(uint16_t);
|
|
|
|
/* Names of the sections that could contain calls to mcount. */
|
|
static int is_mcounted_section_name(char const *const txtname)
|
|
{
|
|
return strncmp(".text", txtname, 5) == 0 ||
|
|
strcmp(".init.text", txtname) == 0 ||
|
|
strcmp(".ref.text", txtname) == 0 ||
|
|
strcmp(".sched.text", txtname) == 0 ||
|
|
strcmp(".spinlock.text", txtname) == 0 ||
|
|
strcmp(".irqentry.text", txtname) == 0 ||
|
|
strcmp(".softirqentry.text", txtname) == 0 ||
|
|
strcmp(".kprobes.text", txtname) == 0 ||
|
|
strcmp(".cpuidle.text", txtname) == 0 ||
|
|
(strncmp(".text.", txtname, 6) == 0 &&
|
|
strcmp(".text..ftrace", txtname) != 0);
|
|
}
|
|
|
|
static char const *already_has_rel_mcount = "success"; /* our work here is done! */
|
|
|
|
/* 32 bit and 64 bit are very similar */
|
|
#include "recordmcount.h"
|
|
#define RECORD_MCOUNT_64
|
|
#include "recordmcount.h"
|
|
|
|
static int arm_is_fake_mcount(Elf32_Rel const *rp)
|
|
{
|
|
switch (ELF32_R_TYPE(w(rp->r_info))) {
|
|
case R_ARM_THM_CALL:
|
|
case R_ARM_CALL:
|
|
case R_ARM_PC24:
|
|
return 0;
|
|
}
|
|
|
|
return 1;
|
|
}
|
|
|
|
static int arm64_is_fake_mcount(Elf64_Rel const *rp)
|
|
{
|
|
return ELF64_R_TYPE(w(rp->r_info)) != R_AARCH64_CALL26;
|
|
}
|
|
|
|
/* 64-bit EM_MIPS has weird ELF64_Rela.r_info.
|
|
* http://techpubs.sgi.com/library/manuals/4000/007-4658-001/pdf/007-4658-001.pdf
|
|
* We interpret Table 29 Relocation Operation (Elf64_Rel, Elf64_Rela) [p.40]
|
|
* to imply the order of the members; the spec does not say so.
|
|
* typedef unsigned char Elf64_Byte;
|
|
* fails on MIPS64 because their <elf.h> already has it!
|
|
*/
|
|
|
|
typedef uint8_t myElf64_Byte; /* Type for a 8-bit quantity. */
|
|
|
|
union mips_r_info {
|
|
Elf64_Xword r_info;
|
|
struct {
|
|
Elf64_Word r_sym; /* Symbol index. */
|
|
myElf64_Byte r_ssym; /* Special symbol. */
|
|
myElf64_Byte r_type3; /* Third relocation. */
|
|
myElf64_Byte r_type2; /* Second relocation. */
|
|
myElf64_Byte r_type; /* First relocation. */
|
|
} r_mips;
|
|
};
|
|
|
|
static uint64_t MIPS64_r_sym(Elf64_Rel const *rp)
|
|
{
|
|
return w(((union mips_r_info){ .r_info = rp->r_info }).r_mips.r_sym);
|
|
}
|
|
|
|
static void MIPS64_r_info(Elf64_Rel *const rp, unsigned sym, unsigned type)
|
|
{
|
|
rp->r_info = ((union mips_r_info){
|
|
.r_mips = { .r_sym = w(sym), .r_type = type }
|
|
}).r_info;
|
|
}
|
|
|
|
static int do_file(char const *const fname)
|
|
{
|
|
unsigned int reltype = 0;
|
|
Elf32_Ehdr *ehdr;
|
|
int rc = -1;
|
|
|
|
ehdr = mmap_file(fname);
|
|
if (!ehdr)
|
|
goto out;
|
|
|
|
w = w4nat;
|
|
w2 = w2nat;
|
|
w8 = w8nat;
|
|
switch (ehdr->e_ident[EI_DATA]) {
|
|
static unsigned int const endian = 1;
|
|
default:
|
|
fprintf(stderr, "unrecognized ELF data encoding %d: %s\n",
|
|
ehdr->e_ident[EI_DATA], fname);
|
|
goto out;
|
|
case ELFDATA2LSB:
|
|
if (*(unsigned char const *)&endian != 1) {
|
|
/* main() is big endian, file.o is little endian. */
|
|
w = w4rev;
|
|
w2 = w2rev;
|
|
w8 = w8rev;
|
|
}
|
|
ideal_nop4_arm = ideal_nop4_arm_le;
|
|
bl_mcount_arm = bl_mcount_arm_le;
|
|
push_arm = push_arm_le;
|
|
ideal_nop2_thumb = ideal_nop2_thumb_le;
|
|
push_bl_mcount_thumb = push_bl_mcount_thumb_le;
|
|
break;
|
|
case ELFDATA2MSB:
|
|
if (*(unsigned char const *)&endian != 0) {
|
|
/* main() is little endian, file.o is big endian. */
|
|
w = w4rev;
|
|
w2 = w2rev;
|
|
w8 = w8rev;
|
|
}
|
|
ideal_nop4_arm = ideal_nop4_arm_be;
|
|
bl_mcount_arm = bl_mcount_arm_be;
|
|
push_arm = push_arm_be;
|
|
ideal_nop2_thumb = ideal_nop2_thumb_be;
|
|
push_bl_mcount_thumb = push_bl_mcount_thumb_be;
|
|
break;
|
|
} /* end switch */
|
|
if (memcmp(ELFMAG, ehdr->e_ident, SELFMAG) != 0 ||
|
|
w2(ehdr->e_type) != ET_REL ||
|
|
ehdr->e_ident[EI_VERSION] != EV_CURRENT) {
|
|
fprintf(stderr, "unrecognized ET_REL file %s\n", fname);
|
|
goto out;
|
|
}
|
|
|
|
gpfx = '_';
|
|
switch (w2(ehdr->e_machine)) {
|
|
default:
|
|
fprintf(stderr, "unrecognized e_machine %u %s\n",
|
|
w2(ehdr->e_machine), fname);
|
|
goto out;
|
|
case EM_386:
|
|
reltype = R_386_32;
|
|
rel_type_nop = R_386_NONE;
|
|
make_nop = make_nop_x86;
|
|
ideal_nop = ideal_nop5_x86_32;
|
|
mcount_adjust_32 = -1;
|
|
gpfx = 0;
|
|
break;
|
|
case EM_ARM:
|
|
reltype = R_ARM_ABS32;
|
|
altmcount = "__gnu_mcount_nc";
|
|
make_nop = make_nop_arm;
|
|
rel_type_nop = R_ARM_NONE;
|
|
is_fake_mcount32 = arm_is_fake_mcount;
|
|
gpfx = 0;
|
|
break;
|
|
case EM_AARCH64:
|
|
reltype = R_AARCH64_ABS64;
|
|
make_nop = make_nop_arm64;
|
|
rel_type_nop = R_AARCH64_NONE;
|
|
ideal_nop = ideal_nop4_arm64;
|
|
is_fake_mcount64 = arm64_is_fake_mcount;
|
|
break;
|
|
case EM_IA_64: reltype = R_IA64_IMM64; break;
|
|
case EM_MIPS: /* reltype: e_class */ break;
|
|
case EM_PPC: reltype = R_PPC_ADDR32; break;
|
|
case EM_PPC64: reltype = R_PPC64_ADDR64; break;
|
|
case EM_S390: /* reltype: e_class */ break;
|
|
case EM_SH: reltype = R_SH_DIR32; gpfx = 0; break;
|
|
case EM_SPARCV9: reltype = R_SPARC_64; break;
|
|
case EM_X86_64:
|
|
make_nop = make_nop_x86;
|
|
ideal_nop = ideal_nop5_x86_64;
|
|
reltype = R_X86_64_64;
|
|
rel_type_nop = R_X86_64_NONE;
|
|
mcount_adjust_64 = -1;
|
|
gpfx = 0;
|
|
break;
|
|
} /* end switch */
|
|
|
|
switch (ehdr->e_ident[EI_CLASS]) {
|
|
default:
|
|
fprintf(stderr, "unrecognized ELF class %d %s\n",
|
|
ehdr->e_ident[EI_CLASS], fname);
|
|
goto out;
|
|
case ELFCLASS32:
|
|
if (w2(ehdr->e_ehsize) != sizeof(Elf32_Ehdr)
|
|
|| w2(ehdr->e_shentsize) != sizeof(Elf32_Shdr)) {
|
|
fprintf(stderr,
|
|
"unrecognized ET_REL file: %s\n", fname);
|
|
goto out;
|
|
}
|
|
if (w2(ehdr->e_machine) == EM_MIPS) {
|
|
reltype = R_MIPS_32;
|
|
is_fake_mcount32 = MIPS32_is_fake_mcount;
|
|
}
|
|
if (do32(ehdr, fname, reltype) < 0)
|
|
goto out;
|
|
break;
|
|
case ELFCLASS64: {
|
|
Elf64_Ehdr *const ghdr = (Elf64_Ehdr *)ehdr;
|
|
if (w2(ghdr->e_ehsize) != sizeof(Elf64_Ehdr)
|
|
|| w2(ghdr->e_shentsize) != sizeof(Elf64_Shdr)) {
|
|
fprintf(stderr,
|
|
"unrecognized ET_REL file: %s\n", fname);
|
|
goto out;
|
|
}
|
|
if (w2(ghdr->e_machine) == EM_S390) {
|
|
reltype = R_390_64;
|
|
mcount_adjust_64 = -14;
|
|
}
|
|
if (w2(ghdr->e_machine) == EM_MIPS) {
|
|
reltype = R_MIPS_64;
|
|
Elf64_r_sym = MIPS64_r_sym;
|
|
Elf64_r_info = MIPS64_r_info;
|
|
is_fake_mcount64 = MIPS64_is_fake_mcount;
|
|
}
|
|
if (do64(ghdr, fname, reltype) < 0)
|
|
goto out;
|
|
break;
|
|
}
|
|
} /* end switch */
|
|
|
|
rc = write_file(fname);
|
|
out:
|
|
file_append_cleanup();
|
|
mmap_cleanup();
|
|
return rc;
|
|
}
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
const char ftrace[] = "/ftrace.o";
|
|
int ftrace_size = sizeof(ftrace) - 1;
|
|
int n_error = 0; /* gcc-4.3.0 false positive complaint */
|
|
int c;
|
|
int i;
|
|
|
|
while ((c = getopt(argc, argv, "w")) >= 0) {
|
|
switch (c) {
|
|
case 'w':
|
|
warn_on_notrace_sect = 1;
|
|
break;
|
|
default:
|
|
fprintf(stderr, "usage: recordmcount [-w] file.o...\n");
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
if ((argc - optind) < 1) {
|
|
fprintf(stderr, "usage: recordmcount [-w] file.o...\n");
|
|
return 0;
|
|
}
|
|
|
|
/* Process each file in turn, allowing deep failure. */
|
|
for (i = optind; i < argc; i++) {
|
|
char *file = argv[i];
|
|
int len;
|
|
|
|
/*
|
|
* The file kernel/trace/ftrace.o references the mcount
|
|
* function but does not call it. Since ftrace.o should
|
|
* not be traced anyway, we just skip it.
|
|
*/
|
|
len = strlen(file);
|
|
if (len >= ftrace_size &&
|
|
strcmp(file + (len - ftrace_size), ftrace) == 0)
|
|
continue;
|
|
|
|
if (do_file(file)) {
|
|
fprintf(stderr, "%s: failed\n", file);
|
|
++n_error;
|
|
}
|
|
}
|
|
return !!n_error;
|
|
}
|