Merge "Input: add safety guards to input_set_keycode()" (4365ffa2) · Commits · e / devices / android_kernel_sony_msm8998

drivers/input/input.c

+16 −10

Original line number	Diff line number	Diff line
		@@ -851,16 +851,18 @@ static int input_default_setkeycode(struct input_dev *dev,
		}
		}

		if (*old_keycode <= KEY_MAX) {
		__clear_bit(*old_keycode, dev->keybit);
		__set_bit(ke->keycode, dev->keybit);

		for (i = 0; i < dev->keycodemax; i++) {
		if (input_fetch_keycode(dev, i) == *old_keycode) {
		__set_bit(*old_keycode, dev->keybit);
		break; /* Setting the bit twice is useless, so break */
		/* Setting the bit twice is useless, so break */
		break;
		}
		}
		}

		__set_bit(ke->keycode, dev->keybit);
		return 0;
		}

		@@ -916,7 +918,11 @@ int input_set_keycode(struct input_dev *dev,
		* Simulate keyup event if keycode is not present
		* in the keymap anymore
		*/
		if (test_bit(EV_KEY, dev->evbit) &&
		if (old_keycode > KEY_MAX) {
		dev_warn(dev->dev.parent ?: &dev->dev,
		"%s: got too big old keycode %#x\n",
		__func__, old_keycode);
		} else if (test_bit(EV_KEY, dev->evbit) &&
		!is_event_supported(old_keycode, dev->keybit, KEY_MAX) &&
		__test_and_clear_bit(old_keycode, dev->key)) {
		struct input_value vals[] = {