From: Greg Kroah-Hartman Date: Tue, 3 Nov 2020 19:36:41 +0000 (+0100) Subject: 4.4-stable patches X-Git-Tag: v4.14.204~14 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0bd1dc7c6cd482fbc59dafaee4d499d48db2ce15;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: arm-s3c24xx-fix-missing-system-reset.patch arm-samsung-fix-pm-debug-build-with-debug_ll-but-mmu.patch arm64-berlin-select-dw_apb_timer_of.patch cachefiles-handle-readpage-error-correctly.patch device-property-don-t-clear-secondary-pointer-for-shared-primary-firmware-node.patch device-property-keep-secondary-firmware-node-secondary-by-type.patch hil-parisc-disable-hil-driver-when-it-gets-stuck.patch staging-comedi-cb_pcidas-allow-2-channel-commands-for-ao-subdevice.patch tty-make-fontx-ioctl-use-the-tty-pointer-they-were-actually-passed.patch --- diff --git a/queue-4.4/arm-s3c24xx-fix-missing-system-reset.patch b/queue-4.4/arm-s3c24xx-fix-missing-system-reset.patch new file mode 100644 index 00000000000..4bf8684c087 --- /dev/null +++ b/queue-4.4/arm-s3c24xx-fix-missing-system-reset.patch @@ -0,0 +1,35 @@ +From f6d7cde84f6c5551586c8b9b68d70f8e6dc9a000 Mon Sep 17 00:00:00 2001 +From: Krzysztof Kozlowski +Date: Tue, 4 Aug 2020 21:26:49 +0200 +Subject: ARM: s3c24xx: fix missing system reset + +From: Krzysztof Kozlowski + +commit f6d7cde84f6c5551586c8b9b68d70f8e6dc9a000 upstream. + +Commit f6361c6b3880 ("ARM: S3C24XX: remove separate restart code") +removed usage of the watchdog reset platform code in favor of the +Samsung SoC watchdog driver. However the latter was not selected thus +S3C24xx platforms lost reset abilities. + +Cc: +Fixes: f6361c6b3880 ("ARM: S3C24XX: remove separate restart code") +Signed-off-by: Krzysztof Kozlowski +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm/Kconfig | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/arch/arm/Kconfig ++++ b/arch/arm/Kconfig +@@ -676,7 +676,9 @@ config ARCH_S3C24XX + select HAVE_S3C_RTC if RTC_CLASS + select MULTI_IRQ_HANDLER + select NEED_MACH_IO_H ++ select S3C2410_WATCHDOG + select SAMSUNG_ATAGS ++ select WATCHDOG + help + Samsung S3C2410, S3C2412, S3C2413, S3C2416, S3C2440, S3C2442, S3C2443 + and S3C2450 SoCs based systems, such as the Simtec Electronics BAST diff --git a/queue-4.4/arm-samsung-fix-pm-debug-build-with-debug_ll-but-mmu.patch b/queue-4.4/arm-samsung-fix-pm-debug-build-with-debug_ll-but-mmu.patch new file mode 100644 index 00000000000..9d6d9ac544d --- /dev/null +++ b/queue-4.4/arm-samsung-fix-pm-debug-build-with-debug_ll-but-mmu.patch @@ -0,0 +1,40 @@ +From 7be0d19c751b02db778ca95e3274d5ea7f31891c Mon Sep 17 00:00:00 2001 +From: Krzysztof Kozlowski +Date: Thu, 10 Sep 2020 17:41:49 +0200 +Subject: ARM: samsung: fix PM debug build with DEBUG_LL but !MMU +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Krzysztof Kozlowski + +commit 7be0d19c751b02db778ca95e3274d5ea7f31891c upstream. + +Selecting CONFIG_SAMSUNG_PM_DEBUG (depending on CONFIG_DEBUG_LL) but +without CONFIG_MMU leads to build errors: + + arch/arm/plat-samsung/pm-debug.c: In function ‘s3c_pm_uart_base’: + arch/arm/plat-samsung/pm-debug.c:57:2: error: + implicit declaration of function ‘debug_ll_addr’ [-Werror=implicit-function-declaration] + +Fixes: 99b2fc2b8b40 ("ARM: SAMSUNG: Use debug_ll_addr() to get UART base address") +Reported-by: kernel test robot +Signed-off-by: Krzysztof Kozlowski +Cc: +Link: https://lore.kernel.org/r/20200910154150.3318-1-krzk@kernel.org +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm/plat-samsung/Kconfig | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/arm/plat-samsung/Kconfig ++++ b/arch/arm/plat-samsung/Kconfig +@@ -239,6 +239,7 @@ config SAMSUNG_PM_DEBUG + bool "Samsung PM Suspend debug" + depends on PM && DEBUG_KERNEL + depends on DEBUG_EXYNOS_UART || DEBUG_S3C24XX_UART || DEBUG_S3C2410_UART ++ depends on DEBUG_LL && MMU + help + Say Y here if you want verbose debugging from the PM Suspend and + Resume code. See diff --git a/queue-4.4/arm64-berlin-select-dw_apb_timer_of.patch b/queue-4.4/arm64-berlin-select-dw_apb_timer_of.patch new file mode 100644 index 00000000000..99b7c92eb88 --- /dev/null +++ b/queue-4.4/arm64-berlin-select-dw_apb_timer_of.patch @@ -0,0 +1,32 @@ +From b0fc70ce1f028e14a37c186d9f7a55e51439b83a Mon Sep 17 00:00:00 2001 +From: Jisheng Zhang +Date: Fri, 9 Oct 2020 15:08:31 +0800 +Subject: arm64: berlin: Select DW_APB_TIMER_OF + +From: Jisheng Zhang + +commit b0fc70ce1f028e14a37c186d9f7a55e51439b83a upstream. + +Berlin SoCs always contain some DW APB timers which can be used as an +always-on broadcast timer. + +Link: https://lore.kernel.org/r/20201009150536.214181fb@xhacker.debian +Cc: # v3.14+ +Signed-off-by: Jisheng Zhang +Signed-off-by: Arnd Bergmann +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm64/Kconfig.platforms | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/arm64/Kconfig.platforms ++++ b/arch/arm64/Kconfig.platforms +@@ -9,6 +9,7 @@ config ARCH_BERLIN + bool "Marvell Berlin SoC Family" + select ARCH_REQUIRE_GPIOLIB + select DW_APB_ICTL ++ select DW_APB_TIMER_OF + help + This enables support for Marvell Berlin SoC Family + diff --git a/queue-4.4/cachefiles-handle-readpage-error-correctly.patch b/queue-4.4/cachefiles-handle-readpage-error-correctly.patch new file mode 100644 index 00000000000..be1a193bec1 --- /dev/null +++ b/queue-4.4/cachefiles-handle-readpage-error-correctly.patch @@ -0,0 +1,41 @@ +From 9480b4e75b7108ee68ecf5bc6b4bd68e8031c521 Mon Sep 17 00:00:00 2001 +From: "Matthew Wilcox (Oracle)" +Date: Mon, 26 Oct 2020 09:12:10 +0000 +Subject: cachefiles: Handle readpage error correctly + +From: Matthew Wilcox (Oracle) + +commit 9480b4e75b7108ee68ecf5bc6b4bd68e8031c521 upstream. + +If ->readpage returns an error, it has already unlocked the page. + +Fixes: 5e929b33c393 ("CacheFiles: Handle truncate unlocking the page we're reading") +Cc: stable@vger.kernel.org +Signed-off-by: Matthew Wilcox (Oracle) +Signed-off-by: David Howells +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + fs/cachefiles/rdwr.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/fs/cachefiles/rdwr.c ++++ b/fs/cachefiles/rdwr.c +@@ -125,7 +125,7 @@ static int cachefiles_read_reissue(struc + _debug("reissue read"); + ret = bmapping->a_ops->readpage(NULL, backpage); + if (ret < 0) +- goto unlock_discard; ++ goto discard; + } + + /* but the page may have been read before the monitor was installed, so +@@ -142,6 +142,7 @@ static int cachefiles_read_reissue(struc + + unlock_discard: + unlock_page(backpage); ++discard: + spin_lock_irq(&object->work_lock); + list_del(&monitor->op_link); + spin_unlock_irq(&object->work_lock); diff --git a/queue-4.4/device-property-don-t-clear-secondary-pointer-for-shared-primary-firmware-node.patch b/queue-4.4/device-property-don-t-clear-secondary-pointer-for-shared-primary-firmware-node.patch new file mode 100644 index 00000000000..c41671cb20a --- /dev/null +++ b/queue-4.4/device-property-don-t-clear-secondary-pointer-for-shared-primary-firmware-node.patch @@ -0,0 +1,50 @@ +From 99aed9227073fb34ce2880cbc7063e04185a65e1 Mon Sep 17 00:00:00 2001 +From: Andy Shevchenko +Date: Thu, 22 Oct 2020 21:41:00 +0300 +Subject: device property: Don't clear secondary pointer for shared primary firmware node + +From: Andy Shevchenko + +commit 99aed9227073fb34ce2880cbc7063e04185a65e1 upstream. + +It appears that firmware nodes can be shared between devices. In such case +when a (child) device is about to be deleted, its firmware node may be shared +and ACPI_COMPANION_SET(..., NULL) call for it breaks the secondary link +of the shared primary firmware node. + +In order to prevent that, check, if the device has a parent and parent's +firmware node is shared with its child, and avoid crashing the link. + +Fixes: c15e1bdda436 ("device property: Fix the secondary firmware node handling in set_primary_fwnode()") +Reported-by: Ferry Toth +Signed-off-by: Andy Shevchenko +Reviewed-by: Heikki Krogerus +Tested-by: Ferry Toth +Cc: 5.9+ # 5.9+ +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/base/core.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/drivers/base/core.c ++++ b/drivers/base/core.c +@@ -2344,6 +2344,7 @@ static inline bool fwnode_is_primary(str + */ + void set_primary_fwnode(struct device *dev, struct fwnode_handle *fwnode) + { ++ struct device *parent = dev->parent; + struct fwnode_handle *fn = dev->fwnode; + + if (fwnode) { +@@ -2355,7 +2356,8 @@ void set_primary_fwnode(struct device *d + } else { + if (fwnode_is_primary(fn)) { + dev->fwnode = fn->secondary; +- fn->secondary = ERR_PTR(-ENODEV); ++ if (!(parent && fn == parent->fwnode)) ++ fn->secondary = ERR_PTR(-ENODEV); + } else { + dev->fwnode = NULL; + } diff --git a/queue-4.4/device-property-keep-secondary-firmware-node-secondary-by-type.patch b/queue-4.4/device-property-keep-secondary-firmware-node-secondary-by-type.patch new file mode 100644 index 00000000000..b4178c22499 --- /dev/null +++ b/queue-4.4/device-property-keep-secondary-firmware-node-secondary-by-type.patch @@ -0,0 +1,55 @@ +From d5dcce0c414fcbfe4c2037b66ac69ea5f9b3f75c Mon Sep 17 00:00:00 2001 +From: Andy Shevchenko +Date: Thu, 22 Oct 2020 21:40:59 +0300 +Subject: device property: Keep secondary firmware node secondary by type + +From: Andy Shevchenko + +commit d5dcce0c414fcbfe4c2037b66ac69ea5f9b3f75c upstream. + +Behind primary and secondary we understand the type of the nodes +which might define their ordering. However, if primary node gone, +we can't maintain the ordering by definition of the linked list. +Thus, by ordering secondary node becomes first in the list. +But in this case the meaning of it is still secondary (or auxiliary). +The type of the node is maintained by the secondary pointer in it: + + secondary pointer Meaning + NULL or valid primary node + ERR_PTR(-ENODEV) secondary node + +So, if by some reason we do the following sequence of calls + + set_primary_fwnode(dev, NULL); + set_primary_fwnode(dev, primary); + +we should preserve secondary node. + +This concept is supported by the description of set_primary_fwnode() +along with implementation of set_secondary_fwnode(). Hence, fix +the commit c15e1bdda436 to follow this as well. + +Fixes: c15e1bdda436 ("device property: Fix the secondary firmware node handling in set_primary_fwnode()") +Cc: Ferry Toth +Signed-off-by: Andy Shevchenko +Reviewed-by: Heikki Krogerus +Tested-by: Ferry Toth +Cc: 5.9+ # 5.9+ +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/base/core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/base/core.c ++++ b/drivers/base/core.c +@@ -2355,7 +2355,7 @@ void set_primary_fwnode(struct device *d + } else { + if (fwnode_is_primary(fn)) { + dev->fwnode = fn->secondary; +- fn->secondary = NULL; ++ fn->secondary = ERR_PTR(-ENODEV); + } else { + dev->fwnode = NULL; + } diff --git a/queue-4.4/hil-parisc-disable-hil-driver-when-it-gets-stuck.patch b/queue-4.4/hil-parisc-disable-hil-driver-when-it-gets-stuck.patch new file mode 100644 index 00000000000..7f51c3eca79 --- /dev/null +++ b/queue-4.4/hil-parisc-disable-hil-driver-when-it-gets-stuck.patch @@ -0,0 +1,136 @@ +From 879bc2d27904354b98ca295b6168718e045c4aa2 Mon Sep 17 00:00:00 2001 +From: Helge Deller +Date: Mon, 19 Oct 2020 16:57:50 +0200 +Subject: hil/parisc: Disable HIL driver when it gets stuck + +From: Helge Deller + +commit 879bc2d27904354b98ca295b6168718e045c4aa2 upstream. + +When starting a HP machine with HIL driver but without an HIL keyboard +or HIL mouse attached, it may happen that data written to the HIL loop +gets stuck (e.g. because the transaction queue is full). Usually one +will then have to reboot the machine because all you see is and endless +output of: + Transaction add failed: transaction already queued? + +In the higher layers hp_sdc_enqueue_transaction() is called to queued up +a HIL packet. This function returns an error code, and this patch adds +the necessary checks for this return code and disables the HIL driver if +further packets can't be sent. + +Tested on a HP 730 and a HP 715/64 machine. + +Signed-off-by: Helge Deller +Cc: +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/input/serio/hil_mlc.c | 21 ++++++++++++++++++--- + drivers/input/serio/hp_sdc_mlc.c | 8 ++++---- + include/linux/hil_mlc.h | 2 +- + 3 files changed, 23 insertions(+), 8 deletions(-) + +--- a/drivers/input/serio/hil_mlc.c ++++ b/drivers/input/serio/hil_mlc.c +@@ -74,7 +74,7 @@ EXPORT_SYMBOL(hil_mlc_unregister); + static LIST_HEAD(hil_mlcs); + static DEFINE_RWLOCK(hil_mlcs_lock); + static struct timer_list hil_mlcs_kicker; +-static int hil_mlcs_probe; ++static int hil_mlcs_probe, hil_mlc_stop; + + static void hil_mlcs_process(unsigned long unused); + static DECLARE_TASKLET_DISABLED(hil_mlcs_tasklet, hil_mlcs_process, 0); +@@ -704,9 +704,13 @@ static int hilse_donode(hil_mlc *mlc) + if (!mlc->ostarted) { + mlc->ostarted = 1; + mlc->opacket = pack; +- mlc->out(mlc); ++ rc = mlc->out(mlc); + nextidx = HILSEN_DOZE; + write_unlock_irqrestore(&mlc->lock, flags); ++ if (rc) { ++ hil_mlc_stop = 1; ++ return 1; ++ } + break; + } + mlc->ostarted = 0; +@@ -717,8 +721,13 @@ static int hilse_donode(hil_mlc *mlc) + + case HILSE_CTS: + write_lock_irqsave(&mlc->lock, flags); +- nextidx = mlc->cts(mlc) ? node->bad : node->good; ++ rc = mlc->cts(mlc); ++ nextidx = rc ? node->bad : node->good; + write_unlock_irqrestore(&mlc->lock, flags); ++ if (rc) { ++ hil_mlc_stop = 1; ++ return 1; ++ } + break; + + default: +@@ -786,6 +795,12 @@ static void hil_mlcs_process(unsigned lo + + static void hil_mlcs_timer(unsigned long data) + { ++ if (hil_mlc_stop) { ++ /* could not send packet - stop immediately. */ ++ pr_warn(PREFIX "HIL seems stuck - Disabling HIL MLC.\n"); ++ return; ++ } ++ + hil_mlcs_probe = 1; + tasklet_schedule(&hil_mlcs_tasklet); + /* Re-insert the periodic task. */ +--- a/drivers/input/serio/hp_sdc_mlc.c ++++ b/drivers/input/serio/hp_sdc_mlc.c +@@ -213,7 +213,7 @@ static int hp_sdc_mlc_cts(hil_mlc *mlc) + priv->tseq[2] = 1; + priv->tseq[3] = 0; + priv->tseq[4] = 0; +- __hp_sdc_enqueue_transaction(&priv->trans); ++ return __hp_sdc_enqueue_transaction(&priv->trans); + busy: + return 1; + done: +@@ -222,7 +222,7 @@ static int hp_sdc_mlc_cts(hil_mlc *mlc) + return 0; + } + +-static void hp_sdc_mlc_out(hil_mlc *mlc) ++static int hp_sdc_mlc_out(hil_mlc *mlc) + { + struct hp_sdc_mlc_priv_s *priv; + +@@ -237,7 +237,7 @@ static void hp_sdc_mlc_out(hil_mlc *mlc) + do_data: + if (priv->emtestmode) { + up(&mlc->osem); +- return; ++ return 0; + } + /* Shouldn't be sending commands when loop may be busy */ + BUG_ON(down_trylock(&mlc->csem)); +@@ -299,7 +299,7 @@ static void hp_sdc_mlc_out(hil_mlc *mlc) + BUG_ON(down_trylock(&mlc->csem)); + } + enqueue: +- hp_sdc_enqueue_transaction(&priv->trans); ++ return hp_sdc_enqueue_transaction(&priv->trans); + } + + static int __init hp_sdc_mlc_init(void) +--- a/include/linux/hil_mlc.h ++++ b/include/linux/hil_mlc.h +@@ -103,7 +103,7 @@ struct hilse_node { + + /* Methods for back-end drivers, e.g. hp_sdc_mlc */ + typedef int (hil_mlc_cts) (hil_mlc *mlc); +-typedef void (hil_mlc_out) (hil_mlc *mlc); ++typedef int (hil_mlc_out) (hil_mlc *mlc); + typedef int (hil_mlc_in) (hil_mlc *mlc, suseconds_t timeout); + + struct hil_mlc_devinfo { diff --git a/queue-4.4/series b/queue-4.4/series index 8c93c80705c..0167d18b82f 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -55,3 +55,12 @@ libceph-clear-con-out_msg-on-policy-stateful_server-faults.patch ring-buffer-return-0-on-success-from-ring_buffer_resize.patch vringh-fix-__vringh_iov-when-riov-and-wiov-are-different.patch ext4-fix-superblock-checksum-calculation-race.patch +tty-make-fontx-ioctl-use-the-tty-pointer-they-were-actually-passed.patch +arm64-berlin-select-dw_apb_timer_of.patch +cachefiles-handle-readpage-error-correctly.patch +hil-parisc-disable-hil-driver-when-it-gets-stuck.patch +arm-samsung-fix-pm-debug-build-with-debug_ll-but-mmu.patch +arm-s3c24xx-fix-missing-system-reset.patch +device-property-keep-secondary-firmware-node-secondary-by-type.patch +device-property-don-t-clear-secondary-pointer-for-shared-primary-firmware-node.patch +staging-comedi-cb_pcidas-allow-2-channel-commands-for-ao-subdevice.patch diff --git a/queue-4.4/staging-comedi-cb_pcidas-allow-2-channel-commands-for-ao-subdevice.patch b/queue-4.4/staging-comedi-cb_pcidas-allow-2-channel-commands-for-ao-subdevice.patch new file mode 100644 index 00000000000..80546a7d6bc --- /dev/null +++ b/queue-4.4/staging-comedi-cb_pcidas-allow-2-channel-commands-for-ao-subdevice.patch @@ -0,0 +1,41 @@ +From 647a6002cb41d358d9ac5de101a8a6dc74748a59 Mon Sep 17 00:00:00 2001 +From: Ian Abbott +Date: Wed, 21 Oct 2020 13:21:42 +0100 +Subject: staging: comedi: cb_pcidas: Allow 2-channel commands for AO subdevice + +From: Ian Abbott + +commit 647a6002cb41d358d9ac5de101a8a6dc74748a59 upstream. + +The "cb_pcidas" driver supports asynchronous commands on the analog +output (AO) subdevice for those boards that have an AO FIFO. The code +(in `cb_pcidas_ao_check_chanlist()` and `cb_pcidas_ao_cmd()`) to +validate and set up the command supports output to a single channel or +to two channels simultaneously (the boards have two AO channels). +However, the code in `cb_pcidas_auto_attach()` that initializes the +subdevices neglects to initialize the AO subdevice's `len_chanlist` +member, leaving it set to 0, but the Comedi core will "correct" it to 1 +if the driver neglected to set it. This limits commands to use a single +channel (either channel 0 or 1), but the limit should be two channels. +Set the AO subdevice's `len_chanlist` member to be the same value as the +`n_chan` member, which will be 2. + +Cc: +Signed-off-by: Ian Abbott +Link: https://lore.kernel.org/r/20201021122142.81628-1-abbotti@mev.co.uk +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/staging/comedi/drivers/cb_pcidas.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/staging/comedi/drivers/cb_pcidas.c ++++ b/drivers/staging/comedi/drivers/cb_pcidas.c +@@ -1351,6 +1351,7 @@ static int cb_pcidas_auto_attach(struct + if (dev->irq && board->has_ao_fifo) { + dev->write_subdev = s; + s->subdev_flags |= SDF_CMD_WRITE; ++ s->len_chanlist = s->n_chan; + s->do_cmdtest = cb_pcidas_ao_cmdtest; + s->do_cmd = cb_pcidas_ao_cmd; + s->cancel = cb_pcidas_ao_cancel; diff --git a/queue-4.4/tty-make-fontx-ioctl-use-the-tty-pointer-they-were-actually-passed.patch b/queue-4.4/tty-make-fontx-ioctl-use-the-tty-pointer-they-were-actually-passed.patch new file mode 100644 index 00000000000..d94c68c9543 --- /dev/null +++ b/queue-4.4/tty-make-fontx-ioctl-use-the-tty-pointer-they-were-actually-passed.patch @@ -0,0 +1,153 @@ +From 90bfdeef83f1d6c696039b6a917190dcbbad3220 Mon Sep 17 00:00:00 2001 +From: Linus Torvalds +Date: Mon, 26 Oct 2020 13:15:23 -0700 +Subject: tty: make FONTX ioctl use the tty pointer they were actually passed + +From: Linus Torvalds + +commit 90bfdeef83f1d6c696039b6a917190dcbbad3220 upstream. + +Some of the font tty ioctl's always used the current foreground VC for +their operations. Don't do that then. + +This fixes a data race on fg_console. + +Side note: both Michael Ellerman and Jiri Slaby point out that all these +ioctls are deprecated, and should probably have been removed long ago, +and everything seems to be using the KDFONTOP ioctl instead. + +In fact, Michael points out that it looks like busybox's loadfont +program seems to have switched over to using KDFONTOP exactly _because_ +of this bug (ahem.. 12 years ago ;-). + +Reported-by: Minh Yuan +Acked-by: Michael Ellerman +Acked-by: Jiri Slaby +Cc: Greg KH +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/tty/vt/vt_ioctl.c | 32 +++++++++++++++++--------------- + 1 file changed, 17 insertions(+), 15 deletions(-) + +--- a/drivers/tty/vt/vt_ioctl.c ++++ b/drivers/tty/vt/vt_ioctl.c +@@ -243,7 +243,7 @@ int vt_waitactive(int n) + + + static inline int +-do_fontx_ioctl(int cmd, struct consolefontdesc __user *user_cfd, int perm, struct console_font_op *op) ++do_fontx_ioctl(struct vc_data *vc, int cmd, struct consolefontdesc __user *user_cfd, int perm, struct console_font_op *op) + { + struct consolefontdesc cfdarg; + int i; +@@ -261,15 +261,16 @@ do_fontx_ioctl(int cmd, struct consolefo + op->height = cfdarg.charheight; + op->charcount = cfdarg.charcount; + op->data = cfdarg.chardata; +- return con_font_op(vc_cons[fg_console].d, op); +- case GIO_FONTX: { ++ return con_font_op(vc, op); ++ ++ case GIO_FONTX: + op->op = KD_FONT_OP_GET; + op->flags = KD_FONT_FLAG_OLD; + op->width = 8; + op->height = cfdarg.charheight; + op->charcount = cfdarg.charcount; + op->data = cfdarg.chardata; +- i = con_font_op(vc_cons[fg_console].d, op); ++ i = con_font_op(vc, op); + if (i) + return i; + cfdarg.charheight = op->height; +@@ -277,7 +278,6 @@ do_fontx_ioctl(int cmd, struct consolefo + if (copy_to_user(user_cfd, &cfdarg, sizeof(struct consolefontdesc))) + return -EFAULT; + return 0; +- } + } + return -EINVAL; + } +@@ -927,7 +927,7 @@ int vt_ioctl(struct tty_struct *tty, + op.height = 0; + op.charcount = 256; + op.data = up; +- ret = con_font_op(vc_cons[fg_console].d, &op); ++ ret = con_font_op(vc, &op); + break; + } + +@@ -938,7 +938,7 @@ int vt_ioctl(struct tty_struct *tty, + op.height = 32; + op.charcount = 256; + op.data = up; +- ret = con_font_op(vc_cons[fg_console].d, &op); ++ ret = con_font_op(vc, &op); + break; + } + +@@ -955,7 +955,7 @@ int vt_ioctl(struct tty_struct *tty, + + case PIO_FONTX: + case GIO_FONTX: +- ret = do_fontx_ioctl(cmd, up, perm, &op); ++ ret = do_fontx_ioctl(vc, cmd, up, perm, &op); + break; + + case PIO_FONTRESET: +@@ -972,11 +972,11 @@ int vt_ioctl(struct tty_struct *tty, + { + op.op = KD_FONT_OP_SET_DEFAULT; + op.data = NULL; +- ret = con_font_op(vc_cons[fg_console].d, &op); ++ ret = con_font_op(vc, &op); + if (ret) + break; + console_lock(); +- con_set_default_unimap(vc_cons[fg_console].d); ++ con_set_default_unimap(vc); + console_unlock(); + break; + } +@@ -1109,8 +1109,9 @@ struct compat_consolefontdesc { + }; + + static inline int +-compat_fontx_ioctl(int cmd, struct compat_consolefontdesc __user *user_cfd, +- int perm, struct console_font_op *op) ++compat_fontx_ioctl(struct vc_data *vc, int cmd, ++ struct compat_consolefontdesc __user *user_cfd, ++ int perm, struct console_font_op *op) + { + struct compat_consolefontdesc cfdarg; + int i; +@@ -1128,7 +1129,8 @@ compat_fontx_ioctl(int cmd, struct compa + op->height = cfdarg.charheight; + op->charcount = cfdarg.charcount; + op->data = compat_ptr(cfdarg.chardata); +- return con_font_op(vc_cons[fg_console].d, op); ++ return con_font_op(vc, op); ++ + case GIO_FONTX: + op->op = KD_FONT_OP_GET; + op->flags = KD_FONT_FLAG_OLD; +@@ -1136,7 +1138,7 @@ compat_fontx_ioctl(int cmd, struct compa + op->height = cfdarg.charheight; + op->charcount = cfdarg.charcount; + op->data = compat_ptr(cfdarg.chardata); +- i = con_font_op(vc_cons[fg_console].d, op); ++ i = con_font_op(vc, op); + if (i) + return i; + cfdarg.charheight = op->height; +@@ -1231,7 +1233,7 @@ long vt_compat_ioctl(struct tty_struct * + */ + case PIO_FONTX: + case GIO_FONTX: +- ret = compat_fontx_ioctl(cmd, up, perm, &op); ++ ret = compat_fontx_ioctl(vc, cmd, up, perm, &op); + break; + + case KDFONTOP: