[RFC PATCH v1 1/5] VT: Add KD_FONT_OP_GET_INFO operation

[Alexey Gladkov]

Each driver has its own restrictions on font size. There is currently no
way to understand what the requirements are. The new operation allows
userspace to get the maximum font size values.

Signed-off-by: Alexey Gladkov <legion@xxxxxxxxxx>
---
 drivers/tty/vt/vt.c       | 27 +++++++++++++++++++++++++++
 drivers/tty/vt/vt_ioctl.c |  2 +-
 include/linux/console.h   |  1 +
 include/uapi/linux/kd.h   |  1 +
 4 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index 156efda7c80d..e1d0f95ccba0 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -4628,6 +4628,31 @@ static int con_font_set(struct vc_data *vc, struct console_font_op *op)
 	return rc;
 }
 
+static int con_font_info(struct vc_data *vc, struct console_font_op *op)
+{
+	struct console_font font;
+	int rc = -EINVAL;
+
+	font.height = max_font_height;
+	font.width = max_font_width;
+	font.charcount = max_font_glyphs;
+
+	console_lock();
+	if (vc->vc_mode != KD_TEXT)
+		rc = -EINVAL;
+	else if (vc->vc_sw->con_font_info)
+		rc = vc->vc_sw->con_font_info(vc, &font);
+	else
+		rc = -ENOSYS;
+	console_unlock();
+
+	op->height = font.height;
+	op->width = font.width;
+	op->charcount = font.charcount;
+
+	return rc;
+}
+
 static int con_font_default(struct vc_data *vc, struct console_font_op *op)
 {
 	struct console_font font = {.width = op->width, .height = op->height};
@@ -4673,6 +4698,8 @@ int con_font_op(struct vc_data *vc, struct console_font_op *op)
 		return con_font_get(vc, op);
 	case KD_FONT_OP_SET_DEFAULT:
 		return con_font_default(vc, op);
+	case KD_FONT_OP_GET_INFO:
+		return con_font_info(vc, op);
 	case KD_FONT_OP_COPY:
 		/* was buggy and never really used */
 		return -EINVAL;
diff --git a/drivers/tty/vt/vt_ioctl.c b/drivers/tty/vt/vt_ioctl.c
index 8c685b501404..d6853d30ad19 100644
--- a/drivers/tty/vt/vt_ioctl.c
+++ b/drivers/tty/vt/vt_ioctl.c
@@ -469,7 +469,7 @@ static int vt_k_ioctl(struct tty_struct *tty, unsigned int cmd,
 
 		if (copy_from_user(&op, up, sizeof(op)))
 			return -EFAULT;
-		if (!perm && op.op != KD_FONT_OP_GET)
+		if (!perm && op.op != KD_FONT_OP_GET && op.op != KD_FONT_OP_GET_INFO)
 			return -EPERM;
 		ret = con_font_op(vc, &op);
 		if (ret)
diff --git a/include/linux/console.h b/include/linux/console.h
index 779d388af8a0..4afd9139d529 100644
--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -59,6 +59,7 @@ struct consw {
 			unsigned int lines);
 	int	(*con_switch)(struct vc_data *vc);
 	int	(*con_blank)(struct vc_data *vc, int blank, int mode_switch);
+	int	(*con_font_info)(struct vc_data *vc, struct console_font *font);
 	int	(*con_font_set)(struct vc_data *vc, struct console_font *font,
 			unsigned int vpitch, unsigned int flags);
 	int	(*con_font_get)(struct vc_data *vc, struct console_font *font,
diff --git a/include/uapi/linux/kd.h b/include/uapi/linux/kd.h
index 6b384065c013..21a1fb18dba0 100644
--- a/include/uapi/linux/kd.h
+++ b/include/uapi/linux/kd.h
@@ -180,6 +180,7 @@ struct console_font {
 #define KD_FONT_OP_COPY		3	/* Obsolete, do not use */
 #define KD_FONT_OP_SET_TALL	4	/* Set font with vpitch = height */
 #define KD_FONT_OP_GET_TALL	5	/* Get font with vpitch = height */
+#define KD_FONT_OP_GET_INFO	6
 
 #define KD_FONT_FLAG_DONT_RECALC 	1	/* Don't recalculate hw charcell size [compat] */
 
-- 
2.43.0