| commit | d32b75e6dc329fc8b15d0ae48cf932f091ed6299 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Feb 09 04:15:13 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 09 04:15:13 2015 +0000 |
| tree | 51223b508912b12d2108bc0d81a62e279fcb6054 | |
| parent | 450cfd189bfcd51da7c94a55199281be45689f1d [diff] | |
| parent | 33b6de4b94e018b3cb621db5eabcb3a4f18bdd3d [diff] |
am 33b6de4b: am d55d8dac: Merge "prevent ioctl_init() to write outside buffer" * commit '33b6de4b94e018b3cb621db5eabcb3a4f18bdd3d': prevent ioctl_init() to write outside buffer
diff --git a/cryptfs.c b/cryptfs.c index cdeb16d..d5ceaef 100644 --- a/cryptfs.c +++ b/cryptfs.c
@@ -319,7 +319,7 @@ io->version[2] = 0; io->flags = flags; if (name) { - strncpy(io->name, name, sizeof(io->name)); + strlcpy(io->name, name, sizeof(io->name)); } }