Commit 09686219 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'printk-for-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk 

Pull printk updates from Petr Mladek:

 - Allow state reset of printk_once() calls.

 - Prevent crashes when dereferencing invalid pointers in vsprintf().
   Only the first byte is checked for simplicity.

 - Make vsprintf warnings consistent and inlined.

 - Treewide conversion of obsolete %pf, %pF to %ps, %pF printf
   modifiers.

 - Some clean up of vsprintf and test_printf code.

* tag 'printk-for-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk:
  lib/vsprintf: Make function pointer_string static
  vsprintf: Limit the length of inlined error messages
  vsprintf: Avoid confusion between invalid address and value
  vsprintf: Prevent crash when dereferencing invalid pointers
  vsprintf: Consolidate handling of unknown pointer specifiers
  vsprintf: Factor out %pO handler as kobject_string()
  vsprintf: Factor out %pV handler as va_format()
  vsprintf: Factor out %p[iI] handler as ip_addr_string()
  vsprintf: Do not check address of well-known strings
  vsprintf: Consistent %pK handling for kptr_restrict == 0
  vsprintf: Shuffle restricted_pointer()
  printk: Tie printk_once / printk_deferred_once into .data.once for reset
  treewide: Switch printk users from %pf and %pF to %ps and %pS, respectively
  lib/test_printf: Switch to bitmap_zalloc()
parents 573de2a6 0f46c783

Documentation/clearing-warn-once.txt

+1 −1
Original line number Diff line number Diff line 


WARN_ONCE / WARN_ON_ONCE only print a warning once.

WARN_ONCE / WARN_ON_ONCE / printk_once only emit a message once.



echo 1 > /sys/kernel/debug/clear_warn_once

Documentation/core-api/printk-formats.rst

+8 −0
Original line number Diff line number Diff line
@@ -58,6 +58,14 @@ A raw pointer value may be printed with %p which will hash the address 
before printing. The kernel also supports extended specifiers for printing

pointers of different types.



Some of the extended specifiers print the data on the given address instead

of printing the address itself. In this case, the following error messages

might be printed instead of the unreachable information::



	(null)	 data on plain NULL address

	(efault) data on invalid address

	(einval) invalid data on a valid address



Plain Pointers

--------------

arch/alpha/kernel/pci_iommu.c

+10 −10
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ static int pci_dac_dma_supported(struct pci_dev *dev, u64 mask) 
		ok = 0;



	/* If both conditions above are met, we are fine. */

	DBGA("pci_dac_dma_supported %s from %pf\n",

	DBGA("pci_dac_dma_supported %s from %ps\n",

	     ok ? "yes" : "no", __builtin_return_address(0));



	return ok;
@@ -281,7 +281,7 @@ pci_map_single_1(struct pci_dev *pdev, void *cpu_addr, size_t size, 
	    && paddr + size <= __direct_map_size) {

		ret = paddr + __direct_map_base;



		DBGA2("pci_map_single: [%p,%zx] -> direct %llx from %pf\n",

		DBGA2("pci_map_single: [%p,%zx] -> direct %llx from %ps\n",

		      cpu_addr, size, ret, __builtin_return_address(0));



		return ret;
@@ -292,7 +292,7 @@ pci_map_single_1(struct pci_dev *pdev, void *cpu_addr, size_t size, 
	if (dac_allowed) {

		ret = paddr + alpha_mv.pci_dac_offset;



		DBGA2("pci_map_single: [%p,%zx] -> DAC %llx from %pf\n",

		DBGA2("pci_map_single: [%p,%zx] -> DAC %llx from %ps\n",

		      cpu_addr, size, ret, __builtin_return_address(0));



		return ret;
@@ -329,7 +329,7 @@ pci_map_single_1(struct pci_dev *pdev, void *cpu_addr, size_t size, 
	ret = arena->dma_base + dma_ofs * PAGE_SIZE;

	ret += (unsigned long)cpu_addr & ~PAGE_MASK;



	DBGA2("pci_map_single: [%p,%zx] np %ld -> sg %llx from %pf\n",

	DBGA2("pci_map_single: [%p,%zx] np %ld -> sg %llx from %ps\n",

	      cpu_addr, size, npages, ret, __builtin_return_address(0));



	return ret;
@@ -396,14 +396,14 @@ static void alpha_pci_unmap_page(struct device *dev, dma_addr_t dma_addr, 
	    && dma_addr < __direct_map_base + __direct_map_size) {

		/* Nothing to do.  */



		DBGA2("pci_unmap_single: direct [%llx,%zx] from %pf\n",

		DBGA2("pci_unmap_single: direct [%llx,%zx] from %ps\n",

		      dma_addr, size, __builtin_return_address(0));



		return;

	}



	if (dma_addr > 0xffffffff) {

		DBGA2("pci64_unmap_single: DAC [%llx,%zx] from %pf\n",

		DBGA2("pci64_unmap_single: DAC [%llx,%zx] from %ps\n",

		      dma_addr, size, __builtin_return_address(0));

		return;

	}
@@ -435,7 +435,7 @@ static void alpha_pci_unmap_page(struct device *dev, dma_addr_t dma_addr, 


	spin_unlock_irqrestore(&arena->lock, flags);



	DBGA2("pci_unmap_single: sg [%llx,%zx] np %ld from %pf\n",

	DBGA2("pci_unmap_single: sg [%llx,%zx] np %ld from %ps\n",

	      dma_addr, size, npages, __builtin_return_address(0));

}
@@ -458,7 +458,7 @@ try_again: 
	cpu_addr = (void *)__get_free_pages(gfp | __GFP_ZERO, order);

	if (! cpu_addr) {

		printk(KERN_INFO "pci_alloc_consistent: "

		       "get_free_pages failed from %pf\n",

		       "get_free_pages failed from %ps\n",

			__builtin_return_address(0));

		/* ??? Really atomic allocation?  Otherwise we could play

		   with vmalloc and sg if we can't find contiguous memory.  */
@@ -477,7 +477,7 @@ try_again: 
		goto try_again;

	}



	DBGA2("pci_alloc_consistent: %zx -> [%p,%llx] from %pf\n",

	DBGA2("pci_alloc_consistent: %zx -> [%p,%llx] from %ps\n",

	      size, cpu_addr, *dma_addrp, __builtin_return_address(0));



	return cpu_addr;
@@ -497,7 +497,7 @@ static void alpha_pci_free_coherent(struct device *dev, size_t size, 
	pci_unmap_single(pdev, dma_addr, size, PCI_DMA_BIDIRECTIONAL);

	free_pages((unsigned long)cpu_addr, get_order(size));



	DBGA2("pci_free_consistent: [%llx,%zx] from %pf\n",

	DBGA2("pci_free_consistent: [%llx,%zx] from %ps\n",

	      dma_addr, size, __builtin_return_address(0));

}

arch/arm/mach-imx/pm-imx6.c

+1 −1
Original line number Diff line number Diff line
@@ -631,7 +631,7 @@ static void imx6_pm_stby_poweroff(void) 
static int imx6_pm_stby_poweroff_probe(void)

{

	if (pm_power_off) {

		pr_warn("%s: pm_power_off already claimed  %p %pf!\n",

		pr_warn("%s: pm_power_off already claimed  %p %ps!\n",

			__func__, pm_power_off, pm_power_off);

		return -EBUSY;

	}

arch/arm/mm/alignment.c

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ static const char *usermode_action[] = { 
static int alignment_proc_show(struct seq_file *m, void *v)

{

	seq_printf(m, "User:\t\t%lu\n", ai_user);

	seq_printf(m, "System:\t\t%lu (%pF)\n", ai_sys, ai_sys_last_pc);

	seq_printf(m, "System:\t\t%lu (%pS)\n", ai_sys, ai_sys_last_pc);

	seq_printf(m, "Skipped:\t%lu\n", ai_skipped);

	seq_printf(m, "Half:\t\t%lu\n", ai_half);

	seq_printf(m, "Word:\t\t%lu\n", ai_word);

CRA Git | Maintained and supported by SUSTech CRA and CCSE