Author: dchagin
Date: Sat Apr 29 09:26:30 2017
New Revision: 317590
URL: https://svnweb.freebsd.org/changeset/base/317590
Log:
MFC r316776 (by cem@):
linux_ioctl: Refactor some v4l2 struct converters
According to the C standard, it is invalid to copy beyond the end of an
object, even if that object is obviously a member of a larger object (a
struct, in this case).
Appease the standard and Coverity by refactoring the copy in a
straightforward way. No functional change.
Modified:
stable/11/sys/compat/linux/linux_ioctl.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/compat/linux/linux_ioctl.c
==============================================================================
--- stable/11/sys/compat/linux/linux_ioctl.c Sat Apr 29 09:21:00 2017
(r317589)
+++ stable/11/sys/compat/linux/linux_ioctl.c Sat Apr 29 09:26:30 2017
(r317590)
@@ -3137,7 +3137,12 @@ linux_to_bsd_v4l2_standard(struct l_v4l2
{
vstd->index = lvstd->index;
vstd->id = lvstd->id;
- memcpy(&vstd->name, &lvstd->name, sizeof(*lvstd) - offsetof(struct
l_v4l2_standard, name));
+ CTASSERT(sizeof(vstd->name) == sizeof(lvstd->name));
+ memcpy(vstd->name, lvstd->name, sizeof(vstd->name));
+ vstd->frameperiod = lvstd->frameperiod;
+ vstd->framelines = lvstd->framelines;
+ CTASSERT(sizeof(vstd->reserved) == sizeof(lvstd->reserved));
+ memcpy(vstd->reserved, lvstd->reserved, sizeof(vstd->reserved));
return (0);
}
@@ -3146,7 +3151,12 @@ bsd_to_linux_v4l2_standard(struct v4l2_s
{
lvstd->index = vstd->index;
lvstd->id = vstd->id;
- memcpy(&lvstd->name, &vstd->name, sizeof(*lvstd) - offsetof(struct
l_v4l2_standard, name));
+ CTASSERT(sizeof(vstd->name) == sizeof(lvstd->name));
+ memcpy(lvstd->name, vstd->name, sizeof(lvstd->name));
+ lvstd->frameperiod = vstd->frameperiod;
+ lvstd->framelines = vstd->framelines;
+ CTASSERT(sizeof(vstd->reserved) == sizeof(lvstd->reserved));
+ memcpy(lvstd->reserved, vstd->reserved, sizeof(lvstd->reserved));
return (0);
}
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
