Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 543537bd authored by Paulo Marques's avatar Paulo Marques Committed by Linus Torvalds
Browse files

[PATCH] create a kstrdup library function 



This patch creates a new kstrdup library function and changes the "local"
implementations in several places to use this function.

Most of the changes come from the sound and net subsystems.  The sound part
had already been acknowledged by Takashi Iwai and the net part by David S.
Miller.

I left UML alone for now because I would need more time to read the code
carefully before making changes there.

Signed-off-by: default avatarPaulo Marques <pmarques@grupopie.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 991114c6

drivers/md/dm-ioctl.c

+3 −11
Original line number Diff line number Diff line
@@ -122,14 +122,6 @@ static struct hash_cell *__get_uuid_cell(const char *str) 
/*-----------------------------------------------------------------

 * Inserting, removing and renaming a device.

 *---------------------------------------------------------------*/

static inline char *kstrdup(const char *str)

{

	char *r = kmalloc(strlen(str) + 1, GFP_KERNEL);

	if (r)

		strcpy(r, str);

	return r;

}



static struct hash_cell *alloc_cell(const char *name, const char *uuid,

				    struct mapped_device *md)

{
@@ -139,7 +131,7 @@ static struct hash_cell *alloc_cell(const char *name, const char *uuid, 
	if (!hc)

		return NULL;



	hc->name = kstrdup(name);

	hc->name = kstrdup(name, GFP_KERNEL);

	if (!hc->name) {

		kfree(hc);

		return NULL;
@@ -149,7 +141,7 @@ static struct hash_cell *alloc_cell(const char *name, const char *uuid, 
		hc->uuid = NULL;



	else {

		hc->uuid = kstrdup(uuid);

		hc->uuid = kstrdup(uuid, GFP_KERNEL);

		if (!hc->uuid) {

			kfree(hc->name);

			kfree(hc);
@@ -273,7 +265,7 @@ static int dm_hash_rename(const char *old, const char *new) 
	/*

	 * duplicate new.

	 */

	new_name = kstrdup(new);

	new_name = kstrdup(new, GFP_KERNEL);

	if (!new_name)

		return -ENOMEM;

drivers/parport/probe.c

+5 −13
Original line number Diff line number Diff line
@@ -48,14 +48,6 @@ static void pretty_print(struct parport *port, int device) 
	printk("\n");

}



static char *strdup(char *str)

{

	int n = strlen(str)+1;

	char *s = kmalloc(n, GFP_KERNEL);

	if (!s) return NULL;

	return strcpy(s, str);

}



static void parse_data(struct parport *port, int device, char *str)

{

	char *txt = kmalloc(strlen(str)+1, GFP_KERNEL);
@@ -88,16 +80,16 @@ static void parse_data(struct parport *port, int device, char *str) 
			if (!strcmp(p, "MFG") || !strcmp(p, "MANUFACTURER")) {

				if (info->mfr)

					kfree (info->mfr);

				info->mfr = strdup(sep);

				info->mfr = kstrdup(sep, GFP_KERNEL);

			} else if (!strcmp(p, "MDL") || !strcmp(p, "MODEL")) {

				if (info->model)

					kfree (info->model);

				info->model = strdup(sep);

				info->model = kstrdup(sep, GFP_KERNEL);

			} else if (!strcmp(p, "CLS") || !strcmp(p, "CLASS")) {

				int i;

				if (info->class_name)

					kfree (info->class_name);

				info->class_name = strdup(sep);

				info->class_name = kstrdup(sep, GFP_KERNEL);

				for (u = sep; *u; u++)

					*u = toupper(*u);

				for (i = 0; classes[i].token; i++) {
@@ -112,7 +104,7 @@ static void parse_data(struct parport *port, int device, char *str) 
				   !strcmp(p, "COMMAND SET")) {

				if (info->cmdset)

					kfree (info->cmdset);

				info->cmdset = strdup(sep);

				info->cmdset = kstrdup(sep, GFP_KERNEL);

				/* if it speaks printer language, it's

				   probably a printer */

				if (strstr(sep, "PJL") || strstr(sep, "PCL"))
@@ -120,7 +112,7 @@ static void parse_data(struct parport *port, int device, char *str) 
			} else if (!strcmp(p, "DES") || !strcmp(p, "DESCRIPTION")) {

				if (info->description)

					kfree (info->description);

				info->description = strdup(sep);

				info->description = kstrdup(sep, GFP_KERNEL);

			}

		}

	rock_on:

include/linux/netdevice.h

+0 −4
Original line number Diff line number Diff line
@@ -925,10 +925,6 @@ extern int skb_checksum_help(struct sk_buff *skb, int inward); 
extern void		net_enable_timestamp(void);

extern void		net_disable_timestamp(void);



#ifdef CONFIG_SYSCTL

extern char *net_sysctl_strdup(const char *s);

#endif



#endif /* __KERNEL__ */



#endif	/* _LINUX_DEV_H */

include/linux/string.h

+2 −0
Original line number Diff line number Diff line
@@ -88,6 +88,8 @@ extern int memcmp(const void *,const void *,__kernel_size_t); 
extern void * memchr(const void *,int,__kernel_size_t);

#endif



extern char *kstrdup(const char *s, int gfp);



#ifdef __cplusplus

}

#endif

include/sound/core.h

+2 −1
Original line number Diff line number Diff line
@@ -292,6 +292,7 @@ void *snd_hidden_kcalloc(size_t n, size_t size, int flags); 
void snd_hidden_kfree(const void *obj);

void *snd_hidden_vmalloc(unsigned long size);

void snd_hidden_vfree(void *obj);

char *snd_hidden_kstrdup(const char *s, int flags);

#define kmalloc(size, flags) snd_hidden_kmalloc(size, flags)

#define kcalloc(n, size, flags) snd_hidden_kcalloc(n, size, flags)

#define kfree(obj) snd_hidden_kfree(obj)
@@ -301,6 +302,7 @@ void snd_hidden_vfree(void *obj); 
#define vmalloc_nocheck(size) snd_wrapper_vmalloc(size)

#define kfree_nocheck(obj) snd_wrapper_kfree(obj)

#define vfree_nocheck(obj) snd_wrapper_vfree(obj)

#define kstrdup(s, flags)  snd_hidden_kstrdup(s, flags)

#else

#define snd_memory_init() /*NOP*/

#define snd_memory_done() /*NOP*/
@@ -311,7 +313,6 @@ void snd_hidden_vfree(void *obj); 
#define kfree_nocheck(obj) kfree(obj)

#define vfree_nocheck(obj) vfree(obj)

#endif

char *snd_kmalloc_strdup(const char *string, int flags);

int copy_to_user_fromio(void __user *dst, const volatile void __iomem *src, size_t count);

int copy_from_user_toio(volatile void __iomem *dst, const void __user *src, size_t count);