Skip to contentSkip to conversation

add_*_randomness calls in usbkbd.c and usbmouse.c

PATCH In review Serge Belyshev 2 participants 3 messages Jan 25, 2004 USB

lore
Share & tools
lore

Serge Belyshev

author
#0 lore raw

PATCH 1/1 add_*_randomness calls in usbkbd.c and usbmouse.c

Please comment on struct usb_kbd. Did I choose right place to get 'randomness' from?

drivers/usb/input/usbkbd.c +2 -0
diff -urN vanilla/drivers/usb/input/usbkbd.c hack/drivers/usb/input/usbkbd.c
@@ -32,6 +32,7 @@
 #include <linux/input.h>
 #include <linux/init.h>
 #include <linux/usb.h>
+#include <linux/random.h>
 
 /*
  * Version Information

@@ -125,6 +126,7 @@
 
 	memcpy(kbd->old, kbd->new, 8);
 
+	add_keyboard_randomness (kbd->new[0]);
 resubmit:
 	i = usb_submit_urb (urb, SLAB_ATOMIC);
 	if (i)
drivers/usb/input/usbmouse.c +2 -0
diff -urN vanilla/drivers/usb/input/usbmouse.c hack/drivers/usb/input/usbmouse.c
@@ -32,6 +32,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/usb.h>
+#include <linux/random.h>
 
 /*
  * Version Information

@@ -89,6 +90,7 @@
 	input_report_rel(dev, REL_WHEEL, data[3]);
 
 	input_sync(dev);
+	add_mouse_randomness (*(u32 *) data);
 resubmit:
 	status = usb_submit_urb (urb, SLAB_ATOMIC);
 	if (status)
#1 lore raw

drivers/usb/input/usbkbd.c line 132

Quoted 12 lines · Serge Belyshev

Please comment on struct usb_kbd. Did I choose right place to get 'randomness' from?

drivers/usb/input/usbkbd.c +1 -0
@@ -125,6 +126,7 @@
 
 	memcpy(kbd->old, kbd->new, 8);
 
+	add_keyboard_randomness (kbd->new[0]);
 resubmit:
 	i = usb_submit_urb (urb, SLAB_ATOMIC);
 	if (i)

This function already calls input_report_key(), which calls add_mouse_randomness(). This change seems to be unneeded.

Quoted 12 lines

diff -urN vanilla/drivers/usb/input/usbmouse.c hack/drivers/usb/input/usbmouse.c

drivers/usb/input/usbmouse.c +1 -0
@@ -32,6 +32,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/usb.h>
+#include <linux/random.h>
 
 /*
  * Version Information

drivers/usb/input/usbmouse.c line 96

Quoted 7 lines
drivers/usb/input/usbmouse.c +1 -0
@@ -89,6 +90,7 @@
 	input_report_rel(dev, REL_WHEEL, data[3]);
 
 	input_sync(dev);
+	add_mouse_randomness (*(u32 *) data);
 resubmit:
 	status = usb_submit_urb (urb, SLAB_ATOMIC);
 	if (status)

Similarly, this function has just called input_report_event() several times.

author
#2 lore raw

This function already calls input_report_key(), which calls add_mouse_randomness(). This change seems to be unneeded.

Ahhh, I forgot to do 'fgrep add_mouse_randomness -r /usr/src/linux'... Sorry for inconvenience.