Merge branch 'fix-unlikely-potential-overflows' of https://github.com/sjvs/mdadm
This commit is contained in:
commit
a0d12d51a7
|
@ -667,7 +667,7 @@ static void find_reject(int mdfd, struct supertype *st, struct mdinfo *sra,
|
|||
* without thinking more */
|
||||
|
||||
for (d = sra->devs; d ; d = d->next) {
|
||||
char dn[10];
|
||||
char dn[24]; // 2*11 bytes for ints (including sign) + colon + null byte
|
||||
int dfd;
|
||||
struct mdinfo info;
|
||||
sprintf(dn, "%d:%d", d->disk.major, d->disk.minor);
|
||||
|
@ -1034,12 +1034,12 @@ static int array_try_spare(char *devname, int *dfdp, struct dev_policy *pol,
|
|||
int mdfd = open_dev(chosen->sys_name);
|
||||
if (mdfd >= 0) {
|
||||
struct mddev_dev devlist;
|
||||
char devname[20];
|
||||
char chosen_devname[24]; // 2*11 for int (including signs) + colon + null
|
||||
devlist.next = NULL;
|
||||
devlist.used = 0;
|
||||
devlist.writemostly = 0;
|
||||
devlist.devname = devname;
|
||||
sprintf(devname, "%d:%d", major(stb.st_rdev),
|
||||
devlist.devname = chosen_devname;
|
||||
sprintf(chosen_devname, "%d:%d", major(stb.st_rdev),
|
||||
minor(stb.st_rdev));
|
||||
devlist.disposition = 'a';
|
||||
close(dfd);
|
||||
|
|
Loading…
Reference in New Issue