chiark / gitweb /
cdrom_id: do not attempt to read past end of buffer
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 28 Oct 2014 01:52:38 +0000 (21:52 -0400)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 28 Oct 2014 02:30:43 +0000 (22:30 -0400)
CID #1238437

src/udev/cdrom_id/cdrom_id.c

index c93a7bf8d13180d3de4d67733d67faa663e67682..7a4b98726cb03b1c666ae675e0ee141eebb80693 100644 (file)
@@ -606,7 +606,7 @@ static int cd_profiles(struct udev *udev, int fd)
                 switch (feature) {
                 case 0x00:
                         log_debug("GET CONFIGURATION: feature 'profiles', with %i entries", features[i+3] / 4);
-                        feature_profiles(udev, &features[i]+4, features[i+3]);
+                        feature_profiles(udev, &features[i]+4, MIN(features[i+3], len - i - 4));
                         break;
                 default:
                         log_debug("GET CONFIGURATION: feature 0x%04x <ignored>, with 0x%02x bytes", feature, features[i+3]);