Re: [PATCH V2 3/6] mpcore_wdt: Fix WDIOC_SETOPTIONS handling

Wim Van Sebroeck
2011-07-06T13:18:09Z

Hi Arnd,

> > According to the include/linux/watchdog.h WDIOC_SETOPTIONS is
> > classified as 'read from device' ioctl call:
> > #define WDIOC_SETOPTIONS _IOR(WATCHDOG_IOCTL_BASE, 4, int)
> >
> > However, the driver 'mpcore_wdt' performs 'copy_from_user' only if
> > _IOC_WRITE is set, thus the local variable 'uarg' which is used in
> > WDIOC_SETOPTIONS handling remains uninitialized.
> >
> > The proper way to fix this is to bind WDIOC_SETOPTIONS to _IOW,
> > but this will break compatibility.
> > So adding additional condition for performing 'copy_from_user'.
> >
> > Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com>
>
> Is the new watchdog driver core ready for 3.1? If so, the best
> solution would be to get rid of the entire ioctl function in
> the mpcore_wdt driver and just use the core for that.
>
> Otherwise, this patch is probably the best solution in the meantime.

Might be a correct fix in the mean time.
But goal is to have core ready for inclusion in 3.1 .
Wolfram is doing conversion of 3 drivers and writing a Howto for doing the conversions.
I'm improving the core based on what Wolfram finds during the conversions.
You may expect a (hopefully) last series of the patches this week.

Kind regards,
Wim.