Skip to contentSkip to conversation

use kzalloc instead of kcalloc(1, ...) in /kernel/kprobes.c

KJ Daniel Marjamäki 1 participant 1 message Nov 29, 2005

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Hello!

I believe you are patching against the wrong version, my friend.

I applied the changes manually and then made a new patch:

kernel/kprobes.c +2 -2
@@ -408,7 +408,7 @@ static inline void add_aggr_kprobe(struc
  /*
   * This is the second or subsequent kprobe at the address - handle
   * the intricacies
- * TODO: Move kcalloc outside the spin_lock
+ * TODO: Move kzalloc outside the spin_lock
   */
  static int __kprobes register_aggr_kprobe(struct kprobe *old_p,
  					  struct kprobe *p)
@@ -420,7 +420,7 @@ static int __kprobes register_aggr_kprob
  		copy_kprobe(old_p, p);
  		ret = add_new_kprobe(old_p, p);
  	} else {
-		ap = kcalloc(1, sizeof(struct kprobe), GFP_ATOMIC);
+		ap = kzalloc(sizeof(struct kprobe), GFP_ATOMIC);
  		if (!ap)
  			return -ENOMEM;
  		add_aggr_kprobe(ap, old_p);

The line numbers are a little different here, compared to your patch.

Regards,
Daniel Marjamäki

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors