Commit 077ab86f authored by Jiri Slaby's avatar Jiri Slaby Committed by Zhang Xiaoxu
Browse files

char: pcmcia: remove all the drivers 

mainline inclusion
from mainline-v6.4-rc1
commit 9b12f050
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I5YGNO
CVE: CVE-2022-44033

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=9b12f050c76f090cc6d0aebe0ef76fed79ec3f15

-------------------------------------------------

These char PCMCIA drivers are buggy[1] and receive only minimal care. It
was concluded[2], that we should try to remove most pcmcia drivers
completely. Let's start with these char broken one.

Note that I also removed a UAPI header: include/uapi/linux/cm4000_cs.h.
I found only coccinelle tests mentioning some ioctl constants from that
file. But they are not actually used. Anyway, should someone complain,
we may reintroduce the header (or its parts).

[1] https://lore.kernel.org/all/f41c2765-80e0-48bc-b1e4-8cfd3230fd4a@www.fastmail.com/
[2] https://lore.kernel.org/all/c5b39544-a4fb-4796-a046-0b9be9853787@app.fastmail.com/



Signed-off-by: default avatarJiri Slaby (SUSE) <jirislaby@kernel.org>
Cc: "Hyunwoo Kim" <imv4bel@gmail.com>
Cc: Harald Welte <laforge@gnumonks.org>
Cc: Lubomir Rintel <lkundrak@v3.sk>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20230222092302.6348-2-jirislaby@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>

Conflicts:
	Documentation/process/magic-number.rst
	Documentation/translations/it_IT/process/magic-number.rst
	Documentation/translations/sp_SP/process/magic-number.rst
	Documentation/translations/zh_CN/process/magic-number.rst
	Documentation/translations/zh_TW/process/magic-number.rst
	Documentation/userspace-api/ioctl/ioctl-number.rst
	MAINTAINERS
	arch/powerpc/configs/ppc6xx_defconfig
	drivers/char/Kconfig
	drivers/char/pcmcia/cm4000_cs.c
	drivers/char/pcmcia/cm4040_cs.c
	drivers/char/pcmcia/scr24x_cs.c
	drivers/char/pcmcia/synclink_cs.c

Signed-off-by: default avatarZhang Xiaoxu <zhangxiaoxu5@huawei.com>
parent 587a869c

Documentation/process/magic-number.rst

+0 −1
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ AX25_MAGIC 0x5316 ax_disp ``drivers/net/mk 
TTY_MAGIC             0x5401           tty_struct               ``include/linux/tty.h``

MGSL_MAGIC            0x5401           mgsl_info                ``drivers/char/synclink.c``

TTY_DRIVER_MAGIC      0x5402           tty_driver               ``include/linux/tty_driver.h``

MGSLPC_MAGIC          0x5402           mgslpc_info              ``drivers/char/pcmcia/synclink_cs.c``

TTY_LDISC_MAGIC       0x5403           tty_ldisc                ``include/linux/tty_ldisc.h``

USB_SERIAL_MAGIC      0x6702           usb_serial               ``drivers/usb/serial/usb-serial.h``

FULL_DUPLEX_MAGIC     0x6969                                    ``drivers/net/ethernet/dec/tulip/de2104x.c``

Documentation/translations/it_IT/process/magic-number.rst

+0 −1
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ AX25_MAGIC 0x5316 ax_disp ``drivers/net/mk 
TTY_MAGIC             0x5401           tty_struct               ``include/linux/tty.h``

MGSL_MAGIC            0x5401           mgsl_info                ``drivers/char/synclink.c``

TTY_DRIVER_MAGIC      0x5402           tty_driver               ``include/linux/tty_driver.h``

MGSLPC_MAGIC          0x5402           mgslpc_info              ``drivers/char/pcmcia/synclink_cs.c``

TTY_LDISC_MAGIC       0x5403           tty_ldisc                ``include/linux/tty_ldisc.h``

USB_SERIAL_MAGIC      0x6702           usb_serial               ``drivers/usb/serial/usb-serial.h``

FULL_DUPLEX_MAGIC     0x6969                                    ``drivers/net/ethernet/dec/tulip/de2104x.c``

Documentation/translations/zh_CN/process/magic-number.rst

+0 −1
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ AX25_MAGIC 0x5316 ax_disp ``drivers/net/mk 
TTY_MAGIC             0x5401           tty_struct               ``include/linux/tty.h``

MGSL_MAGIC            0x5401           mgsl_info                ``drivers/char/synclink.c``

TTY_DRIVER_MAGIC      0x5402           tty_driver               ``include/linux/tty_driver.h``

MGSLPC_MAGIC          0x5402           mgslpc_info              ``drivers/char/pcmcia/synclink_cs.c``

TTY_LDISC_MAGIC       0x5403           tty_ldisc                ``include/linux/tty_ldisc.h``

USB_SERIAL_MAGIC      0x6702           usb_serial               ``drivers/usb/serial/usb-serial.h``

FULL_DUPLEX_MAGIC     0x6969                                    ``drivers/net/ethernet/dec/tulip/de2104x.c``

Documentation/userspace-api/ioctl/ioctl-number.rst

+0 −1
Original line number Diff line number Diff line
@@ -218,7 +218,6 @@ Code Seq# Include File Comments 
'a'   00-0F  drivers/crypto/qat/qat_common/adf_cfg_common.h          conflict! qat driver

'b'   00-FF                                                          conflict! bit3 vme host bridge

                                                                     <mailto:natalia@nikhefk.nikhef.nl>

'c'   all    linux/cm4000_cs.h                                       conflict!

'c'   00-7F  linux/comstats.h                                        conflict!

'c'   00-7F  linux/coda.h                                            conflict!

'c'   00-1F  linux/chio.h                                            conflict!

MAINTAINERS

+0 −17
Original line number Diff line number Diff line
@@ -12920,18 +12920,6 @@ S: Maintained 
F:	Documentation/filesystems/omfs.rst

F:	fs/omfs/









OMNIKEY CARDMAN 4000 DRIVER









M:	Harald Welte <laforge@gnumonks.org>









S:	Maintained









F:	drivers/char/pcmcia/cm4000_cs.c









F:	include/linux/cm4000_cs.h









F:	include/uapi/linux/cm4000_cs.h

















OMNIKEY CARDMAN 4040 DRIVER









M:	Harald Welte <laforge@gnumonks.org>









S:	Maintained









F:	drivers/char/pcmcia/cm4040_cs.*

















OMNIVISION OV13858 SENSOR DRIVER









M:	Sakari Ailus <sakari.ailus@linux.intel.com>









L:	linux-media@vger.kernel.org








@@ -15608,11 +15596,6 @@ F:	include/linux/wait.h







F:	include/uapi/linux/sched.h









F:	kernel/sched/

















SCR24X CHIP CARD INTERFACE DRIVER









M:	Lubomir Rintel <lkundrak@v3.sk>









S:	Supported









F:	drivers/char/pcmcia/scr24x_cs.c

















SCSI CDROM DRIVER









M:	Jens Axboe <axboe@kernel.dk>









L:	linux-scsi@vger.kernel.org