Merge lp:~jm-leddy/ubuntu/precise/efibootmgr/4k-sectors into lp:ubuntu/precise/efibootmgr

[James M. Leddy]

[Colin Watson (cjwatson)]

The version is wrong (s/3/2/), but I'll fix that up. Otherwise this looks fine. Thanks, and sorry for the delay!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2008-06-09 14:05:32 +0000
+++ debian/changelog	2013-08-10 01:02:47 +0000
@@ -1,3 +1,10 @@
+efibootmgr (0.5.4-3ubuntu1.1) precise; urgency=low
+
+  * Apply Fedora patch (efibootmgr-0.5.4-support-4k-sectors.patch) to
+    support non-512-byte logical sectors (LP: #1065281).
+
+ -- James M Leddy <[e-mail]>  Fri, 09 Aug 2013 20:49:39 -0400
+
 efibootmgr (0.5.4-2ubuntu1) intrepid; urgency=low
 
   * Merge from debian unstable, remaining changes:

=== modified file 'src/include/disk.h'
--- src/include/disk.h	2004-08-27 23:12:38 +0000
+++ src/include/disk.h	2013-08-10 01:02:47 +0000
@@ -65,6 +65,9 @@
 		      ata, atapi, scsi, usb,
 		      i1394, fibre, i2o, md};
 
+
+unsigned int lcm(unsigned int x, unsigned int y);
+
 int disk_get_pci(int fd,
 		 unsigned char *bus,
 		 unsigned char *device,

=== modified file 'src/lib/disk.c'
--- src/lib/disk.c	2006-04-01 22:00:02 +0000
+++ src/lib/disk.c	2013-08-10 01:02:47 +0000
@@ -420,6 +420,27 @@
 	return sector_size;
 }
 
+/************************************************************
+ * lcm
+ * Requires:
+ * - numbers of which to find the lowest common multiple
+ * Modifies: nothing
+ * Returns:
+ *  lowest common multiple of x and y
+ ************************************************************/
+unsigned int
+lcm(unsigned int x, unsigned int y)
+{
+	unsigned int m = x, n = y, o;
+
+	while ((o = m % n)) {
+		m = n;
+		n = o;
+	}
+
+	return (x / n) * y;
+}
+
 /**
  * disk_get_partition_info()
  *  @fd - open file descriptor to disk
@@ -442,26 +463,27 @@
 			 uint8_t *mbr_type, uint8_t *signature_type)
 {
 	legacy_mbr *mbr;
-	void *mbr_unaligned;
+	void *mbr_sector;
+	size_t mbr_size;
 	off_t offset;
 	int this_bytes_read = 0;
 	int gpt_invalid=0, mbr_invalid=0;
 	int rc=0;
 	int sector_size = get_sector_size(fd);
 
-	if (sizeof(*mbr) != sector_size)
-		return 1;
-	mbr_unaligned = malloc(sizeof(*mbr)+sector_size-1);
-	mbr = (legacy_mbr *)
-		(((unsigned long)mbr_unaligned + sector_size - 1) &
-		 ~(unsigned long)(sector_size-1));
-	memset(mbr, 0, sizeof(*mbr));
+
+	mbr_size = lcm(sizeof(*mbr), sector_size);
+	if ((rc = posix_memalign(&mbr_sector, sector_size, mbr_size)) != 0)
+		goto error;
+	memset(mbr_sector, '\0', mbr_size);
+
 	offset = lseek(fd, 0, SEEK_SET);
-	this_bytes_read = read(fd, mbr, sizeof(*mbr));
+	this_bytes_read = read(fd, mbr_sector, mbr_size);
 	if (this_bytes_read < sizeof(*mbr)) {
 		rc=1;
 		goto error_free_mbr;
 	}
+	mbr = (legacy_mbr *)mbr_sector;
 	gpt_invalid = gpt_disk_get_partition_info(fd, num,
 						  start, size,
 						  signature,
@@ -479,7 +501,8 @@
 		}
 	}
  error_free_mbr:
-	free(mbr_unaligned);
+	free(mbr_sector);
+ error:
 	return rc;
 }
 

=== modified file 'src/lib/gpt.c'
--- src/lib/gpt.c	2008-04-28 18:12:40 +0000
+++ src/lib/gpt.c	2013-08-10 01:02:47 +0000
@@ -215,26 +215,24 @@
 static ssize_t
 read_lba(int fd, uint64_t lba, void *buffer, size_t bytes)
 {
-	int sector_size = get_sector_size(fd);
-	off_t offset = lba * sector_size;
+        int sector_size = get_sector_size(fd);
+        off_t offset = lba * sector_size;
         ssize_t bytesread;
-        void *aligned;
-        void *unaligned;
-
-        if (bytes % sector_size)
-                return EINVAL;
-
-	unaligned = malloc(bytes+sector_size-1);
-	aligned = (void *)
-		(((unsigned long)unaligned + sector_size - 1) &
-		 ~(unsigned long)(sector_size-1));
-	memset(aligned, 0, bytes);
-
-
-	lseek(fd, offset, SEEK_SET);
-	bytesread = read(fd, aligned, bytes);
-        memcpy(buffer, aligned, bytesread);
-        free(unaligned);
+        void *iobuf;
+        size_t iobuf_size;
+        int rc;
+
+        iobuf_size = lcm(bytes, sector_size);
+        rc = posix_memalign(&iobuf, sector_size, iobuf_size);
+        if (rc)
+                return rc;
+        memset(iobuf, 0, bytes);
+
+
+        lseek(fd, offset, SEEK_SET);
+        bytesread = read(fd, iobuf, iobuf_size);
+        memcpy(buffer, iobuf, bytes);
+        free(iobuf);
 
         /* Kludge.  This is necessary to read/write the last
            block of an odd-sized disk, until Linux 2.5.x kernel fixes.