Changes in 4.9.331 uas: add no-uas quirk for Hiksemi usb_disk usb-storage: Add Hiksemi USB3-FW to IGNORE_UAS uas: ignore UAS for Thinkplus chips net: usb: qmi_wwan: Add new usb-id for Dell branded EM7455 ntfs: fix BUG_ON in ntfs_lookup_inode_by_name() mmc: moxart: fix 4-bit bus width and remove 8-bit bus width mm: prevent page_frag_alloc() from corrupting the memory Revert "drm: bridge: analogix/dp: add panel prepare/unprepare in suspend/resume time" Input: melfas_mip4 - fix return value check in mip4_probe() usbnet: Fix memory leak in usbnet_disconnect() nvme: add new line after variable declatation nvme: Fix IOC_PR_CLEAR and IOC_PR_RELEASE ioctls for nvme devices selftests: Fix the if conditions of in test_extra_filter() clk: iproc: Minor tidy up of iproc pll data structures clk: iproc: Do not rely on node name for correct PLL setup Makefile.extrawarn: Move -Wcast-function-type-strict to W=1 ARM: fix function graph tracer and unwinder dependencies fs: fix UAF/GPF bug in nilfs_mdt_destroy dmaengine: xilinx_dma: cleanup for fetching xlnx,num-fstores property dmaengine: xilinx_dma: Report error in case of dma_set_mask_and_coherent API failure ARM: dts: fix Moxa SDIO 'compatible', remove 'sdhci' misnomer net/ieee802154: fix uninit value bug in dgram_sendmsg um: Cleanup syscall_handler_t cast in syscalls_32.h um: Cleanup compiler warning in arch/x86/um/tls_32.c usb: mon: make mmapped memory read only USB: serial: ftdi_sio: fix 300 bps rate for SIO nilfs2: fix NULL pointer dereference at nilfs_bmap_lookup_at_level() nilfs2: fix leak of nilfs_root in case of writer thread creation failure nilfs2: replace WARN_ONs by nilfs_error for checkpoint acquisition failure ceph: don't truncate file in atomic_open random: clamp credited irq bits to maximum mixed ALSA: hda: Fix position reporting on Poulsbo scsi: stex: Properly zero out the passthrough command structure USB: serial: qcserial: add new usb-id for Dell branded EM7455 random: avoid reading two cache lines on irq randomness wifi: mac80211_hwsim: avoid mac80211 warning on bad rate random: restore O_NONBLOCK support Input: xpad - add supported devices as contributed on github Input: xpad - fix wireless 360 controller breaking after suspend random: use expired timer rather than wq for mixing fast pool ALSA: oss: Fix potential deadlock at unregistration ALSA: rawmidi: Drop register_mutex in snd_rawmidi_free() ALSA: usb-audio: Fix potential memory leaks ALSA: usb-audio: Fix NULL dererence at error path iio: dac: ad5593r: Fix i2c read protocol requirements fs: dlm: fix race between test_bit() and queue_work() fs: dlm: handle -EBUSY first in lock arg validation quota: Check next/prev free block number after reading from quota file regulator: qcom_rpm: Fix circular deferral regression parisc: fbdev/stifb: Align graphics memory size to 4MB UM: cpuinfo: Fix a warning for CONFIG_CPUMASK_OFFSTACK PCI: Sanitise firmware BAR assignments behind a PCI-PCI bridge fbdev: smscufx: Fix use-after-free in ufx_ops_open() nilfs2: fix use-after-free bug of struct nilfs_root ext4: avoid crash when inline data creation follows DIO write ext4: fix null-ptr-deref in ext4_write_info ext4: make ext4_lazyinit_thread freezable ext4: place buffer head allocation before handle start ring-buffer: Allow splice to read previous partially read pages ring-buffer: Check pending waiters when doing wake ups as well ring-buffer: Fix race between reset page and reading page KVM: x86/emulator: Fix handing of POP SS to correctly set interruptibility selinux: use "grep -E" instead of "egrep" sh: machvec: Use char[] for section boundaries wifi: ath10k: add peer map clean up for peer delete in ath10k_sta_state() wifi: mac80211: allow bw change during channel switch in mesh wifi: rtl8xxxu: tighten bounds checking in rtl8xxxu_read_efuse() spi: qup: add missing clk_disable_unprepare on error in spi_qup_resume() spi: qup: add missing clk_disable_unprepare on error in spi_qup_pm_resume_runtime() wifi: rtl8xxxu: gen2: Fix mistake in path B IQ calibration net: fs_enet: Fix wrong check in do_pd_setup spi/omap100k:Fix PM disable depth imbalance in omap1_spi100k_probe mISDN: fix use-after-free bugs in l1oip timer handlers tcp: fix tcp_cwnd_validate() to not forget is_cwnd_limited net: rds: don't hold sock lock when cancelling work from rds_tcp_reset_callbacks() bnx2x: fix potential memory leak in bnx2x_tpa_stop() drm/mipi-dsi: Detach devices when removing the host platform/x86: msi-laptop: Fix old-ec check for backlight registering mmc: au1xmmc: Fix an error handling path in au1xmmc_probe() ASoC: eureka-tlv320: Hold reference returned from of_find_xxx API ALSA: dmaengine: increment buffer pointer atomically memory: of: Fix refcount leak bug in of_get_ddr_timings() soc: qcom: smsm: Fix refcount leak bugs in qcom_smsm_probe() soc: qcom: smem_state: Add refcounting for the 'state->of_node' ARM: dts: kirkwood: lsxl: fix serial line ARM: dts: kirkwood: lsxl: remove first ethernet port ARM: Drop CMDLINE_* dependency on ATAGS ARM: dts: exynos: fix polarity of VBUS GPIO of Origen iio: adc: at91-sama5d2_adc: fix AT91_SAMA5D2_MR_TRACKTIM_MAX iio: inkern: only release the device node when done with it iio: ABI: Fix wrong format of differential capacitance channel ABI. clk: tegra: Fix refcount leak in tegra210_clock_init clk: tegra: Fix refcount leak in tegra114_clock_init clk: tegra20: Fix refcount leak in tegra20_clock_init HSI: omap_ssi: Fix refcount leak in ssi_probe HSI: omap_ssi_port: Fix dma_map_sg error check media: exynos4-is: fimc-is: Add of_node_put() when breaking out of loop tty: xilinx_uartps: Fix the ignore_status media: xilinx: vipp: Fix refcount leak in xvip_graph_dma_init RDMA/rxe: Fix "kernel NULL pointer dereference" error RDMA/rxe: Fix the error caused by qp->sk dyndbg: fix module.dyndbg handling dyndbg: let query-modname override actual module name ata: fix ata_id_sense_reporting_enabled() and ata_id_has_sense_reporting() ata: fix ata_id_has_devslp() ata: fix ata_id_has_ncq_autosense() ata: fix ata_id_has_dipm() drivers: serial: jsm: fix some leaks in probe firmware: google: Test spinlock on panic path to avoid lockups serial: 8250: Fix restoring termios speed after suspend mfd: intel_soc_pmic: Fix an error handling path in intel_soc_pmic_i2c_probe() mfd: lp8788: Fix an error handling path in lp8788_probe() mfd: lp8788: Fix an error handling path in lp8788_irq_init() and lp8788_irq_init() mfd: sm501: Add check for platform_driver_register() dmaengine: ioat: stop mod_timer from resurrecting deleted timer in __cleanup() clk: bcm2835: fix bcm2835_clock_rate_from_divisor declaration clk: ti: dra7-atl: Fix reference leak in of_dra7_atl_clk_probe powerpc/math_emu/efp: Include module.h powerpc/pci_dn: Add missing of_node_put() powerpc: Fix SPE Power ISA properties for e500v1 platforms iommu/omap: Fix buffer overflow in debugfs f2fs: fix race condition on setting FI_NO_EXTENT flag ACPI: video: Add Toshiba Satellite/Portege Z830 quirk MIPS: BCM47XX: Cast memcmp() of function to (void *) powercap: intel_rapl: fix UBSAN shift-out-of-bounds issue thermal: intel_powerclamp: Use get_cpu() instead of smp_processor_id() to avoid crash openvswitch: Fix double reporting of drops in dropwatch openvswitch: Fix overreporting of drops in dropwatch tcp: annotate data-race around tcp_md5sig_pool_populated xfrm: Update ipcomp_scratches with NULL when freed Bluetooth: L2CAP: initialize delayed works at l2cap_chan_create() Bluetooth: hci_sysfs: Fix attempting to call device_add multiple times can: bcm: check the result of can_send() in bcm_can_tx() wifi: rt2x00: don't run Rt5592 IQ calibration on MT7620 Bluetooth: L2CAP: Fix user-after-free r8152: Rate limit overflow messages drm: Use size_t type for len variable in drm_copy_field() drm: Prevent drm_copy_field() to attempt copying a NULL pointer platform/x86: msi-laptop: Change DMI match / alias strings to fix module autoloading drm/amdgpu: fix initial connector audio value ARM: dts: imx7d-sdb: config the max pressure for tsc2046 ARM: dts: imx6q: add missing properties for sram ARM: dts: imx6dl: add missing properties for sram ARM: dts: imx6qp: add missing properties for sram ARM: dts: imx6sl: add missing properties for sram media: cx88: Fix a null-ptr-deref bug in buffer_prepare() scsi: 3w-9xxx: Avoid disabling device if failing to enable it HID: roccat: Fix use-after-free in roccat_read() usb: host: xhci: Fix potential memory leak in xhci_alloc_stream_info() usb: musb: Fix musb_gadget.c rxstate overflow bug Revert "usb: storage: Add quirk for Samsung Fit flash" usb: idmouse: fix an uninit-value in idmouse_open perf intel-pt: Fix segfault in intel_pt_print_info() with uClibc net: ieee802154: return -EINVAL for unknown addr type net/ieee802154: don't warn zero-sized raw_sendmsg() ext4: continue to expand file system when the target size doesn't reach inet: fully convert sk->sk_rx_dst to RCU rules thermal: intel_powerclamp: Use first online CPU as control_cpu gcov: support GCC 12.1 and newer compilers Linux 4.9.331 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I105d6215a29d200abe3330f328ce3c2009ba0df9
366 lines
8.1 KiB
C
366 lines
8.1 KiB
C
/*
|
|
* Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
|
|
* Licensed under the GPL
|
|
*/
|
|
|
|
#include <linux/delay.h>
|
|
#include <linux/init.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/module.h>
|
|
#include <linux/seq_file.h>
|
|
#include <linux/string.h>
|
|
#include <linux/utsname.h>
|
|
#include <linux/sched.h>
|
|
#include <linux/kmsg_dump.h>
|
|
#include <asm/pgtable.h>
|
|
#include <asm/processor.h>
|
|
#include <asm/sections.h>
|
|
#include <asm/setup.h>
|
|
#include <as-layout.h>
|
|
#include <arch.h>
|
|
#include <init.h>
|
|
#include <kern.h>
|
|
#include <kern_util.h>
|
|
#include <mem_user.h>
|
|
#include <os.h>
|
|
|
|
#define DEFAULT_COMMAND_LINE "root=98:0"
|
|
|
|
/* Changed in add_arg and setup_arch, which run before SMP is started */
|
|
static char __initdata command_line[COMMAND_LINE_SIZE] = { 0 };
|
|
|
|
static void __init add_arg(char *arg)
|
|
{
|
|
if (strlen(command_line) + strlen(arg) + 1 > COMMAND_LINE_SIZE) {
|
|
printf("add_arg: Too many command line arguments!\n");
|
|
exit(1);
|
|
}
|
|
if (strlen(command_line) > 0)
|
|
strcat(command_line, " ");
|
|
strcat(command_line, arg);
|
|
}
|
|
|
|
/*
|
|
* These fields are initialized at boot time and not changed.
|
|
* XXX This structure is used only in the non-SMP case. Maybe this
|
|
* should be moved to smp.c.
|
|
*/
|
|
struct cpuinfo_um boot_cpu_data = {
|
|
.loops_per_jiffy = 0,
|
|
.ipi_pipe = { -1, -1 }
|
|
};
|
|
|
|
union thread_union cpu0_irqstack
|
|
__attribute__((__section__(".data..init_irqstack"))) =
|
|
{ INIT_THREAD_INFO(init_task) };
|
|
|
|
unsigned long thread_saved_pc(struct task_struct *task)
|
|
{
|
|
/* FIXME: Need to look up userspace_pid by cpu */
|
|
return os_process_pc(userspace_pid[0]);
|
|
}
|
|
|
|
/* Changed in setup_arch, which is called in early boot */
|
|
static char host_info[(__NEW_UTS_LEN + 1) * 5];
|
|
|
|
static int show_cpuinfo(struct seq_file *m, void *v)
|
|
{
|
|
int index = 0;
|
|
|
|
seq_printf(m, "processor\t: %d\n", index);
|
|
seq_printf(m, "vendor_id\t: User Mode Linux\n");
|
|
seq_printf(m, "model name\t: UML\n");
|
|
seq_printf(m, "mode\t\t: skas\n");
|
|
seq_printf(m, "host\t\t: %s\n", host_info);
|
|
seq_printf(m, "bogomips\t: %lu.%02lu\n\n",
|
|
loops_per_jiffy/(500000/HZ),
|
|
(loops_per_jiffy/(5000/HZ)) % 100);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void *c_start(struct seq_file *m, loff_t *pos)
|
|
{
|
|
return *pos < nr_cpu_ids ? cpu_data + *pos : NULL;
|
|
}
|
|
|
|
static void *c_next(struct seq_file *m, void *v, loff_t *pos)
|
|
{
|
|
++*pos;
|
|
return c_start(m, pos);
|
|
}
|
|
|
|
static void c_stop(struct seq_file *m, void *v)
|
|
{
|
|
}
|
|
|
|
const struct seq_operations cpuinfo_op = {
|
|
.start = c_start,
|
|
.next = c_next,
|
|
.stop = c_stop,
|
|
.show = show_cpuinfo,
|
|
};
|
|
|
|
/* Set in linux_main */
|
|
unsigned long uml_physmem;
|
|
EXPORT_SYMBOL(uml_physmem);
|
|
|
|
unsigned long uml_reserved; /* Also modified in mem_init */
|
|
unsigned long start_vm;
|
|
unsigned long end_vm;
|
|
|
|
/* Set in uml_ncpus_setup */
|
|
int ncpus = 1;
|
|
|
|
/* Set in early boot */
|
|
static int have_root __initdata = 0;
|
|
|
|
/* Set in uml_mem_setup and modified in linux_main */
|
|
long long physmem_size = 32 * 1024 * 1024;
|
|
|
|
static const char *usage_string =
|
|
"User Mode Linux v%s\n"
|
|
" available at http://user-mode-linux.sourceforge.net/\n\n";
|
|
|
|
static int __init uml_version_setup(char *line, int *add)
|
|
{
|
|
printf("%s\n", init_utsname()->release);
|
|
exit(0);
|
|
|
|
return 0;
|
|
}
|
|
|
|
__uml_setup("--version", uml_version_setup,
|
|
"--version\n"
|
|
" Prints the version number of the kernel.\n\n"
|
|
);
|
|
|
|
static int __init uml_root_setup(char *line, int *add)
|
|
{
|
|
have_root = 1;
|
|
return 0;
|
|
}
|
|
|
|
__uml_setup("root=", uml_root_setup,
|
|
"root=<file containing the root fs>\n"
|
|
" This is actually used by the generic kernel in exactly the same\n"
|
|
" way as in any other kernel. If you configure a number of block\n"
|
|
" devices and want to boot off something other than ubd0, you \n"
|
|
" would use something like:\n"
|
|
" root=/dev/ubd5\n\n"
|
|
);
|
|
|
|
static int __init no_skas_debug_setup(char *line, int *add)
|
|
{
|
|
printf("'debug' is not necessary to gdb UML in skas mode - run \n");
|
|
printf("'gdb linux'\n");
|
|
|
|
return 0;
|
|
}
|
|
|
|
__uml_setup("debug", no_skas_debug_setup,
|
|
"debug\n"
|
|
" this flag is not needed to run gdb on UML in skas mode\n\n"
|
|
);
|
|
|
|
static int __init Usage(char *line, int *add)
|
|
{
|
|
const char **p;
|
|
|
|
printf(usage_string, init_utsname()->release);
|
|
p = &__uml_help_start;
|
|
while (p < &__uml_help_end) {
|
|
printf("%s", *p);
|
|
p++;
|
|
}
|
|
exit(0);
|
|
return 0;
|
|
}
|
|
|
|
__uml_setup("--help", Usage,
|
|
"--help\n"
|
|
" Prints this message.\n\n"
|
|
);
|
|
|
|
static void __init uml_checksetup(char *line, int *add)
|
|
{
|
|
struct uml_param *p;
|
|
|
|
p = &__uml_setup_start;
|
|
while (p < &__uml_setup_end) {
|
|
size_t n;
|
|
|
|
n = strlen(p->str);
|
|
if (!strncmp(line, p->str, n) && p->setup_func(line + n, add))
|
|
return;
|
|
p++;
|
|
}
|
|
}
|
|
|
|
static void __init uml_postsetup(void)
|
|
{
|
|
initcall_t *p;
|
|
|
|
p = &__uml_postsetup_start;
|
|
while (p < &__uml_postsetup_end) {
|
|
(*p)();
|
|
p++;
|
|
}
|
|
return;
|
|
}
|
|
|
|
static int panic_exit(struct notifier_block *self, unsigned long unused1,
|
|
void *unused2)
|
|
{
|
|
kmsg_dump(KMSG_DUMP_PANIC);
|
|
bust_spinlocks(1);
|
|
bust_spinlocks(0);
|
|
uml_exitcode = 1;
|
|
os_dump_core();
|
|
return 0;
|
|
}
|
|
|
|
static struct notifier_block panic_exit_notifier = {
|
|
.notifier_call = panic_exit,
|
|
.next = NULL,
|
|
.priority = 0
|
|
};
|
|
|
|
void uml_finishsetup(void)
|
|
{
|
|
atomic_notifier_chain_register(&panic_notifier_list,
|
|
&panic_exit_notifier);
|
|
|
|
uml_postsetup();
|
|
|
|
new_thread_handler();
|
|
}
|
|
|
|
/* Set during early boot */
|
|
unsigned long task_size;
|
|
EXPORT_SYMBOL(task_size);
|
|
|
|
unsigned long host_task_size;
|
|
|
|
unsigned long brk_start;
|
|
unsigned long end_iomem;
|
|
EXPORT_SYMBOL(end_iomem);
|
|
|
|
#define MIN_VMALLOC (32 * 1024 * 1024)
|
|
|
|
int __init linux_main(int argc, char **argv)
|
|
{
|
|
unsigned long avail, diff;
|
|
unsigned long virtmem_size, max_physmem;
|
|
unsigned long stack;
|
|
unsigned int i;
|
|
int add;
|
|
|
|
for (i = 1; i < argc; i++) {
|
|
if ((i == 1) && (argv[i][0] == ' '))
|
|
continue;
|
|
add = 1;
|
|
uml_checksetup(argv[i], &add);
|
|
if (add)
|
|
add_arg(argv[i]);
|
|
}
|
|
if (have_root == 0)
|
|
add_arg(DEFAULT_COMMAND_LINE);
|
|
|
|
host_task_size = os_get_top_address();
|
|
/*
|
|
* TASK_SIZE needs to be PGDIR_SIZE aligned or else exit_mmap craps
|
|
* out
|
|
*/
|
|
task_size = host_task_size & PGDIR_MASK;
|
|
|
|
/* OS sanity checks that need to happen before the kernel runs */
|
|
os_early_checks();
|
|
|
|
brk_start = (unsigned long) sbrk(0);
|
|
|
|
/*
|
|
* Increase physical memory size for exec-shield users
|
|
* so they actually get what they asked for. This should
|
|
* add zero for non-exec shield users
|
|
*/
|
|
|
|
diff = UML_ROUND_UP(brk_start) - UML_ROUND_UP(&_end);
|
|
if (diff > 1024 * 1024) {
|
|
printf("Adding %ld bytes to physical memory to account for "
|
|
"exec-shield gap\n", diff);
|
|
physmem_size += UML_ROUND_UP(brk_start) - UML_ROUND_UP(&_end);
|
|
}
|
|
|
|
uml_physmem = (unsigned long) __binary_start & PAGE_MASK;
|
|
|
|
/* Reserve up to 4M after the current brk */
|
|
uml_reserved = ROUND_4M(brk_start) + (1 << 22);
|
|
|
|
setup_machinename(init_utsname()->machine);
|
|
|
|
highmem = 0;
|
|
iomem_size = (iomem_size + PAGE_SIZE - 1) & PAGE_MASK;
|
|
max_physmem = TASK_SIZE - uml_physmem - iomem_size - MIN_VMALLOC;
|
|
|
|
/*
|
|
* Zones have to begin on a 1 << MAX_ORDER page boundary,
|
|
* so this makes sure that's true for highmem
|
|
*/
|
|
max_physmem &= ~((1 << (PAGE_SHIFT + MAX_ORDER)) - 1);
|
|
if (physmem_size + iomem_size > max_physmem) {
|
|
highmem = physmem_size + iomem_size - max_physmem;
|
|
physmem_size -= highmem;
|
|
}
|
|
|
|
high_physmem = uml_physmem + physmem_size;
|
|
end_iomem = high_physmem + iomem_size;
|
|
high_memory = (void *) end_iomem;
|
|
|
|
start_vm = VMALLOC_START;
|
|
|
|
virtmem_size = physmem_size;
|
|
stack = (unsigned long) argv;
|
|
stack &= ~(1024 * 1024 - 1);
|
|
avail = stack - start_vm;
|
|
if (physmem_size > avail)
|
|
virtmem_size = avail;
|
|
end_vm = start_vm + virtmem_size;
|
|
|
|
if (virtmem_size < physmem_size)
|
|
printf("Kernel virtual memory size shrunk to %lu bytes\n",
|
|
virtmem_size);
|
|
|
|
os_flush_stdout();
|
|
|
|
return start_uml();
|
|
}
|
|
|
|
int __init __weak read_initrd(void)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
void __init setup_arch(char **cmdline_p)
|
|
{
|
|
stack_protections((unsigned long) &init_thread_info);
|
|
setup_physmem(uml_physmem, uml_reserved, physmem_size, highmem);
|
|
mem_total_pages(physmem_size, iomem_size, highmem);
|
|
read_initrd();
|
|
|
|
paging_init();
|
|
strlcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);
|
|
*cmdline_p = command_line;
|
|
setup_hostinfo(host_info, sizeof host_info);
|
|
}
|
|
|
|
void __init check_bugs(void)
|
|
{
|
|
arch_check_bugs();
|
|
os_check_bugs();
|
|
}
|
|
|
|
void apply_alternatives(struct alt_instr *start, struct alt_instr *end)
|
|
{
|
|
}
|