Sfoglia il codice sorgente

[IPVS]: Use kmemdup where appropriate

Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Arnaldo Carvalho de Melo 18 anni fa
parent
commit
8b2ed4bba4
2 ha cambiato i file con 2 aggiunte e 9 eliminazioni
  1. 1 2
      net/ipv4/ipvs/ip_vs_app.c
  2. 1 7
      net/ipv4/ipvs/ip_vs_proto.c

+ 1 - 2
net/ipv4/ipvs/ip_vs_app.c

@@ -80,10 +80,9 @@ ip_vs_app_inc_new(struct ip_vs_app *app, __u16 proto, __u16 port)
 	if (!pp->unregister_app)
 		return -EOPNOTSUPP;
 
-	inc = kmalloc(sizeof(struct ip_vs_app), GFP_KERNEL);
+	inc = kmemdup(app, sizeof(*inc), GFP_KERNEL);
 	if (!inc)
 		return -ENOMEM;
-	memcpy(inc, app, sizeof(*inc));
 	INIT_LIST_HEAD(&inc->p_list);
 	INIT_LIST_HEAD(&inc->incs_list);
 	inc->app = app;

+ 1 - 7
net/ipv4/ipvs/ip_vs_proto.c

@@ -118,13 +118,7 @@ void ip_vs_protocol_timeout_change(int flags)
 int *
 ip_vs_create_timeout_table(int *table, int size)
 {
-	int *t;
-
-	t = kmalloc(size, GFP_ATOMIC);
-	if (t == NULL)
-		return NULL;
-	memcpy(t, table, size);
-	return t;
+	return kmemdup(table, size, GFP_ATOMIC);
 }