Commit 26873aca authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'driver-core-4.20-rc1' of... 

Merge tag 'driver-core-4.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Pull driver core updates from Greg KH:
 "Here is a small number of driver core patches for 4.20-rc1.

  Not much happened here this merge window, only a very tiny number of
  patches that do:

   - add BUS_ATTR_WO() for use by drivers

   - component error path fixes

   - kernfs range check fix

   - other tiny error path fixes and const changes

  All of these have been in linux-next with no reported issues for a
  while"

* tag 'driver-core-4.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
  devres: provide devm_kstrdup_const()
  mm: move is_kernel_rodata() to asm-generic/sections.h
  devres: constify p in devm_kfree()
  driver core: add BUS_ATTR_WO() macro
  kernfs: Fix range checks in kernfs_get_target_path
  component: fix loop condition to call unbind() if bind() fails
  drivers/base/devtmpfs.c: don't pretend path is const in delete_path
  kernfs: update comment about kernfs_path() return value
parents 9703fc8c 09d1ea1c

drivers/base/component.c

+3 −3
Original line number Diff line number Diff line
@@ -536,9 +536,9 @@ int component_bind_all(struct device *master_dev, void *data) 
		}



	if (ret != 0) {

		for (; i--; )

			if (!master->match->compare[i].duplicate) {

				c = master->match->compare[i].component;

		for (; i > 0; i--)

			if (!master->match->compare[i - 1].duplicate) {

				c = master->match->compare[i - 1].component;

				component_unbind(c, master, data);

			}

	}

drivers/base/devres.c

+34 −2
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
#include <linux/slab.h>

#include <linux/percpu.h>



#include <asm/sections.h>



#include "base.h"



struct devres_node {
@@ -822,6 +824,28 @@ char *devm_kstrdup(struct device *dev, const char *s, gfp_t gfp) 
}

EXPORT_SYMBOL_GPL(devm_kstrdup);



/**

 * devm_kstrdup_const - resource managed conditional string duplication

 * @dev: device for which to duplicate the string

 * @s: the string to duplicate

 * @gfp: the GFP mask used in the kmalloc() call when allocating memory

 *

 * Strings allocated by devm_kstrdup_const will be automatically freed when

 * the associated device is detached.

 *

 * RETURNS:

 * Source string if it is in .rodata section otherwise it falls back to

 * devm_kstrdup.

 */

const char *devm_kstrdup_const(struct device *dev, const char *s, gfp_t gfp)

{

	if (is_kernel_rodata((unsigned long)s))

		return s;



	return devm_kstrdup(dev, s, gfp);

}

EXPORT_SYMBOL_GPL(devm_kstrdup_const);



/**

 * devm_kvasprintf - Allocate resource managed space and format a string

 *		     into that.
@@ -885,11 +909,19 @@ EXPORT_SYMBOL_GPL(devm_kasprintf); 
 *

 * Free memory allocated with devm_kmalloc().

 */

void devm_kfree(struct device *dev, void *p)

void devm_kfree(struct device *dev, const void *p)

{

	int rc;



	rc = devres_destroy(dev, devm_kmalloc_release, devm_kmalloc_match, p);

	/*

	 * Special case: pointer to a string in .rodata returned by

	 * devm_kstrdup_const().

	 */

	if (unlikely(is_kernel_rodata((unsigned long)p)))

		return;



	rc = devres_destroy(dev, devm_kmalloc_release,

			    devm_kmalloc_match, (void *)p);

	WARN_ON(rc);

}

EXPORT_SYMBOL_GPL(devm_kfree);

drivers/base/devtmpfs.c

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ static int dev_rmdir(const char *name) 


static int delete_path(const char *nodepath)

{

	const char *path;

	char *path;

	int err = 0;



	path = kstrdup(nodepath, GFP_KERNEL);

fs/kernfs/symlink.c

+4 −1
Original line number Diff line number Diff line
@@ -72,6 +72,9 @@ static int kernfs_get_target_path(struct kernfs_node *parent, 
		if (base == kn)

			break;



		if ((s - path) + 3 >= PATH_MAX)

			return -ENAMETOOLONG;



		strcpy(s, "../");

		s += 3;

		base = base->parent;
@@ -88,7 +91,7 @@ static int kernfs_get_target_path(struct kernfs_node *parent, 
	if (len < 2)

		return -EINVAL;

	len--;

	if ((s - path) + len > PATH_MAX)

	if ((s - path) + len >= PATH_MAX)

		return -ENAMETOOLONG;



	/* reverse fillup of target string from target to base */

include/asm-generic/sections.h

+14 −0
Original line number Diff line number Diff line
@@ -141,4 +141,18 @@ static inline bool init_section_intersects(void *virt, size_t size) 
	return memory_intersects(__init_begin, __init_end, virt, size);

}



/**

 * is_kernel_rodata - checks if the pointer address is located in the

 *                    .rodata section

 *

 * @addr: address to check

 *

 * Returns: true if the address is located in .rodata, false otherwise.

 */

static inline bool is_kernel_rodata(unsigned long addr)

{

	return addr >= (unsigned long)__start_rodata &&

	       addr < (unsigned long)__end_rodata;

}



#endif /* _ASM_GENERIC_SECTIONS_H_ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE