Changes in 4.9.180 ext4: do not delete unlinked inode from orphan list on failed truncate KVM: x86: fix return value for reserved EFER bio: fix improper use of smp_mb__before_atomic() Revert "scsi: sd: Keep disk read-only when re-reading partition" crypto: vmx - CTR: always increment IV as quadword kvm: svm/avic: fix off-by-one in checking host APIC ID libnvdimm/namespace: Fix label tracking error arm64: Save and restore OSDLR_EL1 across suspend/resume gfs2: Fix sign extension bug in gfs2_update_stats Btrfs: do not abort transaction at btrfs_update_root() after failure to COW path Btrfs: fix race between ranged fsync and writeback of adjacent ranges btrfs: sysfs: don't leak memory when failing add fsid fbdev: fix divide error in fb_var_to_videomode hugetlb: use same fault hash key for shared and private mappings fbdev: fix WARNING in __alloc_pages_nodemask bug media: cpia2: Fix use-after-free in cpia2_exit media: vivid: use vfree() instead of kfree() for dev->bitmap_cap ssb: Fix possible NULL pointer dereference in ssb_host_pcmcia_exit at76c50x-usb: Don't register led_trigger if usb_register_driver failed perf tools: No need to include bitops.h in util.h tools include: Adopt linux/bits.h Revert "btrfs: Honour FITRIM range constraints during free space trim" gfs2: Fix lru_count going negative cxgb4: Fix error path in cxgb4_init_module mmc: core: Verify SD bus width dmaengine: tegra210-dma: free dma controller in remove() net: ena: gcc 8: fix compilation warning ASoC: hdmi-codec: unlock the device on startup errors powerpc/boot: Fix missing check of lseek() return value ASoC: imx: fix fiq dependencies spi: pxa2xx: fix SCR (divisor) calculation brcm80211: potential NULL dereference in brcmf_cfg80211_vndr_cmds_dcmd_handler() ARM: vdso: Remove dependency with the arch_timer driver internals arm64: Fix compiler warning from pte_unmap() with -Wunused-but-set-variable sched/cpufreq: Fix kobject memleak scsi: qla2xxx: Fix a qla24xx_enable_msix() error path iwlwifi: pcie: don't crash on invalid RX interrupt rtc: 88pm860x: prevent use-after-free on device remove w1: fix the resume command API dmaengine: pl330: _stop: clear interrupt status mac80211/cfg80211: update bss channel on channel switch ASoC: fsl_sai: Update is_slave_mode with correct value mwifiex: prevent an array overflow net: cw1200: fix a NULL pointer dereference crypto: sun4i-ss - Fix invalid calculation of hash end bcache: return error immediately in bch_journal_replay() bcache: fix failure in journal relplay bcache: add failure check to run_cache_set() for journal replay bcache: avoid clang -Wunintialized warning x86/build: Move _etext to actual end of .text smpboot: Place the __percpu annotation correctly x86/mm: Remove in_nmi() warning from 64-bit implementation of vmalloc_fault() mm/uaccess: Use 'unsigned long' to placate UBSAN warnings on older GCC versions HID: logitech-hidpp: use RAP instead of FAP to get the protocol version pinctrl: pistachio: fix leaked of_node references dmaengine: at_xdmac: remove BUG_ON macro in tasklet media: coda: clear error return value before picture run media: ov6650: Move v4l2_clk_get() to ov6650_video_probe() helper media: au0828: stop video streaming only when last user stops media: ov2659: make S_FMT succeed even if requested format doesn't match audit: fix a memory leak bug media: au0828: Fix NULL pointer dereference in au0828_analog_stream_enable() media: pvrusb2: Prevent a buffer overflow powerpc/numa: improve control of topology updates sched/core: Check quota and period overflow at usec to nsec conversion sched/core: Handle overflow in cpu_shares_write_u64 USB: core: Don't unbind interfaces following device reset failure x86/irq/64: Limit IST stack overflow check to #DB stack i40e: don't allow changes to HW VLAN stripping on active port VLANs arm64: vdso: Fix clock_getres() for CLOCK_REALTIME RDMA/cxgb4: Fix null pointer dereference on alloc_skb failure hwmon: (vt1211) Use request_muxed_region for Super-IO accesses hwmon: (smsc47m1) Use request_muxed_region for Super-IO accesses hwmon: (smsc47b397) Use request_muxed_region for Super-IO accesses hwmon: (pc87427) Use request_muxed_region for Super-IO accesses hwmon: (f71805f) Use request_muxed_region for Super-IO accesses scsi: libsas: Do discovery on empty PHY to update PHY info mmc: core: make pwrseq_emmc (partially) support sleepy GPIO controllers mmc_spi: add a status check for spi_sync_locked mmc: sdhci-of-esdhc: add erratum eSDHC5 support mmc: sdhci-of-esdhc: add erratum eSDHC-A001 and A-008358 support PM / core: Propagate dev->power.wakeup_path when no callbacks extcon: arizona: Disable mic detect if running when driver is removed s390: cio: fix cio_irb declaration cpufreq: ppc_cbe: fix possible object reference leak cpufreq/pasemi: fix possible object reference leak cpufreq: pmac32: fix possible object reference leak x86/build: Keep local relocations with ld.lld iio: ad_sigma_delta: Properly handle SPI bus locking vs CS assertion iio: hmc5843: fix potential NULL pointer dereferences iio: common: ssp_sensors: Initialize calculated_time in ssp_common_process_data rtlwifi: fix a potential NULL pointer dereference mwifiex: Fix mem leak in mwifiex_tm_cmd brcmfmac: fix missing checks for kmemdup b43: shut up clang -Wuninitialized variable warning brcmfmac: convert dev_init_lock mutex to completion brcmfmac: fix race during disconnect when USB completion is in progress brcmfmac: fix Oops when bringing up interface during USB disconnect scsi: ufs: Fix regulator load and icc-level configuration scsi: ufs: Avoid configuring regulator with undefined voltage range arm64: cpu_ops: fix a leaked reference by adding missing of_node_put x86/uaccess, signal: Fix AC=1 bloat x86/ia32: Fix ia32_restore_sigcontext() AC leak chardev: add additional check for minor range overlap HID: core: move Usage Page concatenation to Main item ASoC: eukrea-tlv320: fix a leaked reference by adding missing of_node_put ASoC: fsl_utils: fix a leaked reference by adding missing of_node_put cxgb3/l2t: Fix undefined behaviour spi: tegra114: reset controller on probe media: wl128x: prevent two potential buffer overflows virtio_console: initialize vtermno value for ports tty: ipwireless: fix missing checks for ioremap x86/mce: Fix machine_check_poll() tests for error types rcutorture: Fix cleanup path for invalid torture_type strings rcuperf: Fix cleanup path for invalid perf_type strings usb: core: Add PM runtime calls to usb_hcd_platform_shutdown scsi: qla4xxx: avoid freeing unallocated dma memory dmaengine: tegra210-adma: use devm_clk_*() helpers media: m88ds3103: serialize reset messages in m88ds3103_set_frontend media: go7007: avoid clang frame overflow warning with KASAN scsi: lpfc: Fix FDMI manufacturer attribute value media: saa7146: avoid high stack usage with clang scsi: lpfc: Fix SLI3 commands being issued on SLI4 devices spi : spi-topcliff-pch: Fix to handle empty DMA buffers spi: rspi: Fix sequencer reset during initialization spi: Fix zero length xfer bug ASoC: davinci-mcasp: Fix clang warning without CONFIG_PM drm: Wake up next in drm_read() chain if we are forced to putback the event Linux 4.9.180 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
252 lines
6.9 KiB
C
252 lines
6.9 KiB
C
/*
|
|
* Program to hack in a PT_NOTE program header entry in an ELF file.
|
|
* This is needed for OF on RS/6000s to load an image correctly.
|
|
* Note that OF needs a program header entry for the note, not an
|
|
* ELF section.
|
|
*
|
|
* Copyright 2000 Paul Mackerras.
|
|
*
|
|
* Adapted for 64 bit little endian images by Andrew Tauferner.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version
|
|
* 2 of the License, or (at your option) any later version.
|
|
*
|
|
* Usage: addnote zImage
|
|
*/
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <fcntl.h>
|
|
#include <unistd.h>
|
|
#include <string.h>
|
|
|
|
/* CHRP note section */
|
|
static const char arch[] = "PowerPC";
|
|
|
|
#define N_DESCR 6
|
|
unsigned int descr[N_DESCR] = {
|
|
0xffffffff, /* real-mode = true */
|
|
0x02000000, /* real-base, i.e. where we expect OF to be */
|
|
0xffffffff, /* real-size */
|
|
0xffffffff, /* virt-base */
|
|
0xffffffff, /* virt-size */
|
|
0x4000, /* load-base */
|
|
};
|
|
|
|
/* RPA note section */
|
|
static const char rpaname[] = "IBM,RPA-Client-Config";
|
|
|
|
/*
|
|
* Note: setting ignore_my_client_config *should* mean that OF ignores
|
|
* all the other fields, but there is a firmware bug which means that
|
|
* it looks at the splpar field at least. So these values need to be
|
|
* reasonable.
|
|
*/
|
|
#define N_RPA_DESCR 8
|
|
unsigned int rpanote[N_RPA_DESCR] = {
|
|
0, /* lparaffinity */
|
|
64, /* min_rmo_size */
|
|
0, /* min_rmo_percent */
|
|
40, /* max_pft_size */
|
|
1, /* splpar */
|
|
-1, /* min_load */
|
|
0, /* new_mem_def */
|
|
1, /* ignore_my_client_config */
|
|
};
|
|
|
|
#define ROUNDUP(len) (((len) + 3) & ~3)
|
|
|
|
unsigned char buf[1024];
|
|
#define ELFDATA2LSB 1
|
|
#define ELFDATA2MSB 2
|
|
static int e_data = ELFDATA2MSB;
|
|
#define ELFCLASS32 1
|
|
#define ELFCLASS64 2
|
|
static int e_class = ELFCLASS32;
|
|
|
|
#define GET_16BE(off) ((buf[off] << 8) + (buf[(off)+1]))
|
|
#define GET_32BE(off) ((GET_16BE(off) << 16U) + GET_16BE((off)+2U))
|
|
#define GET_64BE(off) ((((unsigned long long)GET_32BE(off)) << 32ULL) + \
|
|
((unsigned long long)GET_32BE((off)+4ULL)))
|
|
#define PUT_16BE(off, v)(buf[off] = ((v) >> 8) & 0xff, \
|
|
buf[(off) + 1] = (v) & 0xff)
|
|
#define PUT_32BE(off, v)(PUT_16BE((off), (v) >> 16L), PUT_16BE((off) + 2, (v)))
|
|
#define PUT_64BE(off, v)((PUT_32BE((off), (v) >> 32L), \
|
|
PUT_32BE((off) + 4, (v))))
|
|
|
|
#define GET_16LE(off) ((buf[off]) + (buf[(off)+1] << 8))
|
|
#define GET_32LE(off) (GET_16LE(off) + (GET_16LE((off)+2U) << 16U))
|
|
#define GET_64LE(off) ((unsigned long long)GET_32LE(off) + \
|
|
(((unsigned long long)GET_32LE((off)+4ULL)) << 32ULL))
|
|
#define PUT_16LE(off, v) (buf[off] = (v) & 0xff, \
|
|
buf[(off) + 1] = ((v) >> 8) & 0xff)
|
|
#define PUT_32LE(off, v) (PUT_16LE((off), (v)), PUT_16LE((off) + 2, (v) >> 16L))
|
|
#define PUT_64LE(off, v) (PUT_32LE((off), (v)), PUT_32LE((off) + 4, (v) >> 32L))
|
|
|
|
#define GET_16(off) (e_data == ELFDATA2MSB ? GET_16BE(off) : GET_16LE(off))
|
|
#define GET_32(off) (e_data == ELFDATA2MSB ? GET_32BE(off) : GET_32LE(off))
|
|
#define GET_64(off) (e_data == ELFDATA2MSB ? GET_64BE(off) : GET_64LE(off))
|
|
#define PUT_16(off, v) (e_data == ELFDATA2MSB ? PUT_16BE(off, v) : \
|
|
PUT_16LE(off, v))
|
|
#define PUT_32(off, v) (e_data == ELFDATA2MSB ? PUT_32BE(off, v) : \
|
|
PUT_32LE(off, v))
|
|
#define PUT_64(off, v) (e_data == ELFDATA2MSB ? PUT_64BE(off, v) : \
|
|
PUT_64LE(off, v))
|
|
|
|
/* Structure of an ELF file */
|
|
#define E_IDENT 0 /* ELF header */
|
|
#define E_PHOFF (e_class == ELFCLASS32 ? 28 : 32)
|
|
#define E_PHENTSIZE (e_class == ELFCLASS32 ? 42 : 54)
|
|
#define E_PHNUM (e_class == ELFCLASS32 ? 44 : 56)
|
|
#define E_HSIZE (e_class == ELFCLASS32 ? 52 : 64)
|
|
|
|
#define EI_MAGIC 0 /* offsets in E_IDENT area */
|
|
#define EI_CLASS 4
|
|
#define EI_DATA 5
|
|
|
|
#define PH_TYPE 0 /* ELF program header */
|
|
#define PH_OFFSET (e_class == ELFCLASS32 ? 4 : 8)
|
|
#define PH_FILESZ (e_class == ELFCLASS32 ? 16 : 32)
|
|
#define PH_HSIZE (e_class == ELFCLASS32 ? 32 : 56)
|
|
|
|
#define PT_NOTE 4 /* Program header type = note */
|
|
|
|
|
|
unsigned char elf_magic[4] = { 0x7f, 'E', 'L', 'F' };
|
|
|
|
int
|
|
main(int ac, char **av)
|
|
{
|
|
int fd, n, i;
|
|
unsigned long ph, ps, np;
|
|
long nnote, nnote2, ns;
|
|
|
|
if (ac != 2) {
|
|
fprintf(stderr, "Usage: %s elf-file\n", av[0]);
|
|
exit(1);
|
|
}
|
|
fd = open(av[1], O_RDWR);
|
|
if (fd < 0) {
|
|
perror(av[1]);
|
|
exit(1);
|
|
}
|
|
|
|
nnote = 12 + ROUNDUP(strlen(arch) + 1) + sizeof(descr);
|
|
nnote2 = 12 + ROUNDUP(strlen(rpaname) + 1) + sizeof(rpanote);
|
|
|
|
n = read(fd, buf, sizeof(buf));
|
|
if (n < 0) {
|
|
perror("read");
|
|
exit(1);
|
|
}
|
|
|
|
if (memcmp(&buf[E_IDENT+EI_MAGIC], elf_magic, 4) != 0)
|
|
goto notelf;
|
|
e_class = buf[E_IDENT+EI_CLASS];
|
|
if (e_class != ELFCLASS32 && e_class != ELFCLASS64)
|
|
goto notelf;
|
|
e_data = buf[E_IDENT+EI_DATA];
|
|
if (e_data != ELFDATA2MSB && e_data != ELFDATA2LSB)
|
|
goto notelf;
|
|
if (n < E_HSIZE)
|
|
goto notelf;
|
|
|
|
ph = (e_class == ELFCLASS32 ? GET_32(E_PHOFF) : GET_64(E_PHOFF));
|
|
ps = GET_16(E_PHENTSIZE);
|
|
np = GET_16(E_PHNUM);
|
|
if (ph < E_HSIZE || ps < PH_HSIZE || np < 1)
|
|
goto notelf;
|
|
if (ph + (np + 2) * ps + nnote + nnote2 > n)
|
|
goto nospace;
|
|
|
|
for (i = 0; i < np; ++i) {
|
|
if (GET_32(ph + PH_TYPE) == PT_NOTE) {
|
|
fprintf(stderr, "%s already has a note entry\n",
|
|
av[1]);
|
|
exit(0);
|
|
}
|
|
ph += ps;
|
|
}
|
|
|
|
/* XXX check that the area we want to use is all zeroes */
|
|
for (i = 0; i < 2 * ps + nnote + nnote2; ++i)
|
|
if (buf[ph + i] != 0)
|
|
goto nospace;
|
|
|
|
/* fill in the program header entry */
|
|
ns = ph + 2 * ps;
|
|
PUT_32(ph + PH_TYPE, PT_NOTE);
|
|
if (e_class == ELFCLASS32)
|
|
PUT_32(ph + PH_OFFSET, ns);
|
|
else
|
|
PUT_64(ph + PH_OFFSET, ns);
|
|
|
|
if (e_class == ELFCLASS32)
|
|
PUT_32(ph + PH_FILESZ, nnote);
|
|
else
|
|
PUT_64(ph + PH_FILESZ, nnote);
|
|
|
|
/* fill in the note area we point to */
|
|
/* XXX we should probably make this a proper section */
|
|
PUT_32(ns, strlen(arch) + 1);
|
|
PUT_32(ns + 4, N_DESCR * 4);
|
|
PUT_32(ns + 8, 0x1275);
|
|
strcpy((char *) &buf[ns + 12], arch);
|
|
ns += 12 + strlen(arch) + 1;
|
|
for (i = 0; i < N_DESCR; ++i, ns += 4)
|
|
PUT_32BE(ns, descr[i]);
|
|
|
|
/* fill in the second program header entry and the RPA note area */
|
|
ph += ps;
|
|
PUT_32(ph + PH_TYPE, PT_NOTE);
|
|
if (e_class == ELFCLASS32)
|
|
PUT_32(ph + PH_OFFSET, ns);
|
|
else
|
|
PUT_64(ph + PH_OFFSET, ns);
|
|
|
|
if (e_class == ELFCLASS32)
|
|
PUT_32(ph + PH_FILESZ, nnote);
|
|
else
|
|
PUT_64(ph + PH_FILESZ, nnote2);
|
|
|
|
/* fill in the note area we point to */
|
|
PUT_32(ns, strlen(rpaname) + 1);
|
|
PUT_32(ns + 4, sizeof(rpanote));
|
|
PUT_32(ns + 8, 0x12759999);
|
|
strcpy((char *) &buf[ns + 12], rpaname);
|
|
ns += 12 + ROUNDUP(strlen(rpaname) + 1);
|
|
for (i = 0; i < N_RPA_DESCR; ++i, ns += 4)
|
|
PUT_32BE(ns, rpanote[i]);
|
|
|
|
/* Update the number of program headers */
|
|
PUT_16(E_PHNUM, np + 2);
|
|
|
|
/* write back */
|
|
i = lseek(fd, (long) 0, SEEK_SET);
|
|
if (i < 0) {
|
|
perror("lseek");
|
|
exit(1);
|
|
}
|
|
i = write(fd, buf, n);
|
|
if (i < 0) {
|
|
perror("write");
|
|
exit(1);
|
|
}
|
|
if (i < n) {
|
|
fprintf(stderr, "%s: write truncated\n", av[1]);
|
|
exit(1);
|
|
}
|
|
|
|
exit(0);
|
|
|
|
notelf:
|
|
fprintf(stderr, "%s does not appear to be an ELF file\n", av[1]);
|
|
exit(1);
|
|
|
|
nospace:
|
|
fprintf(stderr, "sorry, I can't find space in %s to put the note\n",
|
|
av[1]);
|
|
exit(1);
|
|
}
|