diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-04-15 00:48:45 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-04-15 00:52:24 +0200 |
| commit | 1e8e0a3221e27f7cc944dd6d734b95e86f67ce5c (patch) | |
| tree | d629fbcc337b633942e8a3483c4ce9c5b7b225fc /src/udev/ata_id | |
| parent | bus: remove two unused variables (diff) | |
| download | systemd-1e8e0a3221e27f7cc944dd6d734b95e86f67ce5c.tar.xz systemd-1e8e0a3221e27f7cc944dd6d734b95e86f67ce5c.zip | |
udev/ata_id: zero out variable properly
b8a2b0f76 'use initalization instead of explicit zeroing'
introduced a bug where only the first sizeof(uint_t*) bytes
would be zeroed out, instead of the whole array.
Diffstat (limited to 'src/udev/ata_id')
| -rw-r--r-- | src/udev/ata_id/ata_id.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/udev/ata_id/ata_id.c b/src/udev/ata_id/ata_id.c index 4d30fd8994..68a06b93b8 100644 --- a/src/udev/ata_id/ata_id.c +++ b/src/udev/ata_id/ata_id.c @@ -334,11 +334,10 @@ static int disk_identify(struct udev *udev, int peripheral_device_type; int all_nul_bytes; int n; - int is_packet_device; + int is_packet_device = 0; /* init results */ - zero(out_identify); - is_packet_device = 0; + memzero(out_identify, 512); /* If we were to use ATA PASS_THROUGH (12) on an ATAPI device * we could accidentally blank media. This is because MMC's BLANK @@ -402,7 +401,7 @@ static int disk_identify(struct udev *udev, out: if (out_is_packet_device != NULL) - *out_is_packet_device = is_packet_device; + *out_is_packet_device = is_packet_device; return ret; } |