linux-stable.git/drivers/media, branch v4.9.232

media: dvb_frontend: fix return error code

2020-06-30T19:38:36+00:00

commit 330dada5957e3ca0c8811b14c45e3ac42c694651 upstream

The correct error code when a function is not defined is
-ENOTSUPP. It was typoed wrong as -EOPNOTSUPP, with,
unfortunately, exists, but it is not used by the DVB core.

Thanks-to: Geert Uytterhoeven 
Thanks-to: Arnd Bergmann 

To make me revisit this code.

Fixes: a9cb97c3e628 ("media: dvb_frontend: be sure to init dvb_frontend_handle_ioctl() return code")
Signed-off-by: Mauro Carvalho Chehab 
Signed-off-by: Florian Fainelli 
Signed-off-by: Greg Kroah-Hartman

media: dvb_frontend: fix wrong cast in compat_ioctl

2020-06-30T19:38:35+00:00

commit 5c6c9c4830b76d851d38829611b3c3e4be0f5cdf upstream

FE_GET_PROPERTY has always failed as following situations:
  - Use compatible ioctl
  - The array of 'struct dtv_property' has 2 or more items

This patch fixes wrong cast to a pointer 'struct dtv_property' from a
pointer of 2nd or after item of 'struct compat_dtv_property' array.

Signed-off-by: Katsuhiro Suzuki 
Signed-off-by: Mauro Carvalho Chehab 
Signed-off-by: Florian Fainelli 
Signed-off-by: Greg Kroah-Hartman

media: dvb_frontend: Add commands implementation for compat ioct

2020-06-30T19:38:35+00:00

commit 18192a77f0810933ab71a46c1b260d230d7352ee upstream

The dtv_properties structure and the dtv_property structure are
different sizes in 32-bit and 64-bit system. This patch provides
FE_SET_PROPERTY and FE_GET_PROPERTY ioctl commands implementation for
32-bit user space applications.

Signed-off-by: Jaedon Shin 
Signed-off-by: Mauro Carvalho Chehab 
Signed-off-by: Florian Fainelli 
Signed-off-by: Greg Kroah-Hartman

media: dvb_frontend: Add compat_ioctl callback

2020-06-30T19:38:35+00:00

commit c2dfd2276cec63a0c6f6ce18ed83800d96fde542 upstream

Adds compat_ioctl for 32-bit user space applications on a 64-bit system.

[m.chehab@osg.samsung.com: add missing include compat.h]
Signed-off-by: Jaedon Shin 
Signed-off-by: Mauro Carvalho Chehab 
Signed-off-by: Florian Fainelli 
Signed-off-by: Greg Kroah-Hartman

media: dvb_frontend: Add unlocked_ioctl in dvb_frontend.c

2020-06-30T19:38:35+00:00

commit a2282fd1fe2ebcda480426dbfaaa7c4e87e27399 upstream

Adds unlocked ioctl function directly in dvb_frontend.c instead of using
dvb_generic_ioctl().

Signed-off-by: Jaedon Shin 
Signed-off-by: Mauro Carvalho Chehab 
Signed-off-by: Florian Fainelli 
Signed-off-by: Greg Kroah-Hartman

media: dvb_frontend: be sure to init dvb_frontend_handle_ioctl() return code

2020-06-30T19:38:35+00:00

commit a9cb97c3e628902e37583d8a40bb28cf76522cf1 upstream

As smatch warned:
	drivers/media/dvb-core/dvb_frontend.c:2468 dvb_frontend_handle_ioctl() error: uninitialized symbol 'err'.

The ioctl handler actually got a regression here: before changeset
d73dcf0cdb95 ("media: dvb_frontend: cleanup ioctl handling logic"),
the code used to return -EOPNOTSUPP if an ioctl handler was not
implemented on a driver. After the change, it may return a random
value.

Fixes: d73dcf0cdb95 ("media: dvb_frontend: cleanup ioctl handling logic")

Cc: stable@vger.kernel.org
Signed-off-by: Mauro Carvalho Chehab 
Tested-by: Daniel Scheller 
Signed-off-by: Mauro Carvalho Chehab 
Signed-off-by: Florian Fainelli 
Signed-off-by: Greg Kroah-Hartman

media: dvb_frontend: dtv_property_process_set() cleanups

2020-06-30T19:38:35+00:00

commit media: dvb_frontend: dtv_property_process_set() cleanups upstream

Since all properties in the func dtv_property_process_set() use
at most 4 bytes arguments, change the code to pass
u32 cmd and u32 data as function arguments, instead of passing a
pointer to the entire struct dtv_property *tvp.

Instead of having a generic dtv_property_dump(), added its own
properties debug logic in the dtv_property_process_set().

Signed-off-by: Satendra Singh Thakur 
Reviewed-by: Shuah Khan 
Signed-off-by: Mauro Carvalho Chehab 
Signed-off-by: Florian Fainelli 
Signed-off-by: Greg Kroah-Hartman

media: dvb_frontend: fix return values for FE_SET_PROPERTY

2020-06-30T19:38:35+00:00

commit 259a41d9ae8f3689742267f340ad2b159d00b302 upstream

There are several problems with regards to the return of
FE_SET_PROPERTY. The original idea were to return per-property
return codes via tvp->result field, and to return an updated
set of values.

However, that never worked. What's actually implemented is:

- the FE_SET_PROPERTY implementation doesn't call .get_frontend
  callback in order to get the actual parameters after return;

- the tvp->result field is only filled if there's no error.
  So, it is always filled with zero;

- FE_SET_PROPERTY doesn't call memdup_user() nor any other
  copy_to_user() function. So, any changes to the properties
  will be lost;

- FE_SET_PROPERTY is declared as a write-only ioctl (IOW).

While we could fix the above, it could cause regressions.

So, let's just assume what the code really does, updating
the documentation accordingly and removing the logic that
would update the discarded tvp->result.

Reviewed-by: Shuah Khan 
Signed-off-by: Mauro Carvalho Chehab 
Signed-off-by: Florian Fainelli 
Signed-off-by: Greg Kroah-Hartman

media: dvb_frontend: better document the -EPERM condition

2020-06-30T19:38:34+00:00

commit da5516b5e81d45a96291823620f6c820178dc055 upstream

Two readonly ioctls can't be allowed if the frontend device
is opened in read only mode. Explain why.

Reviewed by: Shuah Khan 

Signed-off-by: Mauro Carvalho Chehab 
Signed-off-by: Florian Fainelli 
Signed-off-by: Greg Kroah-Hartman

media: dvb_frontend: get rid of property cache's state

2020-06-30T19:38:34+00:00

commit ef2cc27cf860b79874e9fde1419dd67c3372e41c upstream

In the past, I guess the idea was to use state in order to
allow an autofush logic. However, in the current code, it is
used only for debug messages, on a poor man's solution, as
there's already a debug message to indicate when the properties
got flushed.

So, just get rid of it for good.

Reviewed-by: Shuah Khan 
Signed-off-by: Mauro Carvalho Chehab 
Signed-off-by: Florian Fainelli 
Signed-off-by: Greg Kroah-Hartman