Attachment 69584 Details for Bug 56782 – 0001-aes2550-Harden-against-low-finger-pressure.patch

[patch] 0001-aes2550-Harden-against-low-finger-pressure.patch

0001-aes2550-Harden-against-low-finger-pressure.patch (text/plain), 2.18 KB, created by Vasily Khoruzhick on 2012-11-05 20:19:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vasily Khoruzhick

Created: 2012-11-05 20:19:52 UTC

Size: 2.18 KB

patch

obsolete

>From 433ffdfc33c0f706997b2680b7fc8e6ddc4fed0c Mon Sep 17 00:00:00 2001
>From: Vasily Khoruzhick <anarsoul@gmail.com>
>Date: Sat, 3 Nov 2012 18:30:43 +0300
>Subject: [PATCH] aes2550: Harden against low finger pressure
>
>Stop scan only after 3rd heartbeat message
>---
> libfprint/drivers/aes2550.c | 18 ++++++++++++++----
> 1 file changed, 14 insertions(+), 4 deletions(-)
>
>diff --git a/libfprint/drivers/aes2550.c b/libfprint/drivers/aes2550.c
>index e072730..3bc95c2 100644
>--- a/libfprint/drivers/aes2550.c
>+++ b/libfprint/drivers/aes2550.c
>@@ -59,6 +59,7 @@ struct aes2550_dev {
> 	GSList *strips;
> 	size_t strips_len;
> 	gboolean deactivating;
>+	int heartbeat_cnt;
> };
> 
> /****** IMAGE PROCESSING ******/
>@@ -369,6 +370,7 @@ static void capture_set_idle_reqs_cb(struct libusb_transfer *transfer)
> static void capture_read_data_cb(struct libusb_transfer *transfer)
> {
> 	struct fpi_ssm *ssm = transfer->user_data;
>+	struct aes2550_dev *aesdev = ssm->priv;
> 	unsigned char *data = transfer->buffer;
> 	int r;
> 
>@@ -390,14 +392,21 @@ static void capture_read_data_cb(struct libusb_transfer *transfer)
> 				fpi_ssm_mark_aborted(ssm, -EPROTO);
> 				goto out;
> 			}
>+			aesdev->heartbeat_cnt = 0;
> 			fpi_ssm_jump_to_state(ssm, CAPTURE_READ_DATA);
> 			break;
> 		case AES2550_HEARTBEAT_SIZE:
> 			if (data[0] == AES2550_HEARTBEAT_MAGIC) {
>-				/* No data for a long time, looks like finger was removed (or no movement) */
>-				/* assemble image and submit it to library */
>-				fp_dbg("Got heartbeat => last frame");
>-				fpi_ssm_next_state(ssm);
>+				/* No data for a long time => finger was removed or there's no movement */
>+				aesdev->heartbeat_cnt++;
>+				if (aesdev->heartbeat_cnt == 3) {
>+					/* Got 3 heartbeat message, that's enough to consider that finger was removed,
>+					 * assemble image and submit it to the library */
>+					fp_dbg("Got 3 heartbeats => finger removed");
>+					fpi_ssm_next_state(ssm);
>+				} else {
>+					fpi_ssm_jump_to_state(ssm, CAPTURE_READ_DATA);
>+				}
> 			}
> 			break;
> 		default:
>@@ -498,6 +507,7 @@ static void start_capture(struct fp_img_dev *dev)
> 		return;
> 	}
> 
>+	aesdev->heartbeat_cnt = 0;
> 	ssm = fpi_ssm_new(dev->dev, capture_run_state, CAPTURE_NUM_STATES);
> 	fp_dbg("");
> 	ssm->priv = dev;
>-- 
>1.8.0
>

Actions: View | Splinter Review

Attachments on bug 56782: 69584 | 69865

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.