06.11.2016 10:09, Corey Hickey пишет: > On 2016-11-05 05:31, Andrei Borzenkov wrote: >>> diff --git a/grub-core/osdep/devmapper/getroot.c >>> b/grub-core/osdep/devmapper/getroot.c >>> index 72e5582..a13a39c 100644 >>> --- a/grub-core/osdep/devmapper/getroot.c >>> +++ b/grub-core/osdep/devmapper/getroot.c >>> @@ -143,7 +143,7 @@ grub_util_get_dm_abstraction (const char *os_dev) >>> grub_free (uuid); >>> return GRUB_DEV_ABSTRACTION_LVM; >>> } >>> - if (strncmp (uuid, "CRYPT-LUKS1-", 4) == 0) >>> + if (strncmp (uuid, "CRYPT-LUKS1-", 12) == 0 >> >> Committed, thanks! We really need some wrapper around (strncmp (foo, >> "bar", sizeof ("bar") - 1), but for now it is OK as bug fix. > > Excellent, you're welcome. That seemed like the most simple fix. > > I took a stab at adding such a wrapper, but there are a ton of files > that could use it which I won't have a chance at being able to test. I > can send in an untested patch if you want... >
Large scale replacement will have to wait until release, but we sure can discuss (and add) macro itself. I'm leaning towards simple #define GRUB_IS_PREFIX(string,prefix) (strncmp((string), #prefix, sizeof (#prefix) - 1) == 0) Any other idea how to make it constant-safe? >> P.S. please in future either use git send-email or attach git >> format-patch to make it easier to apply. Thank you. > > Got it. > > Thanks, > Corey > > _______________________________________________ > Grub-devel mailing list > Grub-devel@gnu.org > https://lists.gnu.org/mailman/listinfo/grub-devel _______________________________________________ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel