diff for duplicates of <20190325090626.GC16023@kadam> diff --git a/a/1.txt b/N1/1.txt index e70066b..c1324c2 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -22,8 +22,8 @@ index b79d3bbd8350..cee78485df02 100644 - if (ctrl->menu_skip_mask & (1 << ptr.p_s32[idx])) + if (ctrl->menu_skip_mask & (1ULL << ptr.p_s32[idx])) return -EINVAL; - if (ctrl->type = V4L2_CTRL_TYPE_MENU && - ctrl->qmenu[ptr.p_s32[idx]][0] = '\0') + if (ctrl->type == V4L2_CTRL_TYPE_MENU && + ctrl->qmenu[ptr.p_s32[idx]][0] == '\0') @@ -2918,7 +2918,7 @@ int v4l2_querymenu(struct v4l2_ctrl_handler *hdl, struct v4l2_querymenu *qm) return -EINVAL; @@ -32,6 +32,6 @@ index b79d3bbd8350..cee78485df02 100644 + if (ctrl->menu_skip_mask & (1ULL << i)) return -EINVAL; /* Empty menu items should also be skipped */ - if (ctrl->type = V4L2_CTRL_TYPE_MENU) { + if (ctrl->type == V4L2_CTRL_TYPE_MENU) { -- 2.17.1 diff --git a/a/content_digest b/N1/content_digest index 8e8c494..27615a8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Subject\0[PATCH] media: v4l2-ctrl: potential shift wrapping bugs\0" - "Date\0Mon, 25 Mar 2019 09:06:26 +0000\0" + "Date\0Mon, 25 Mar 2019 12:06:26 +0300\0" "To\0Mauro Carvalho Chehab <mchehab@kernel.org>\0" "Cc\0Hans Verkuil <hverkuil-cisco@xs4all.nl>" Sakari Ailus <sakari.ailus@linux.intel.com> @@ -38,8 +38,8 @@ "-\t\tif (ctrl->menu_skip_mask & (1 << ptr.p_s32[idx]))\n" "+\t\tif (ctrl->menu_skip_mask & (1ULL << ptr.p_s32[idx]))\n" " \t\t\treturn -EINVAL;\n" - " \t\tif (ctrl->type = V4L2_CTRL_TYPE_MENU &&\n" - " \t\t ctrl->qmenu[ptr.p_s32[idx]][0] = '\\0')\n" + " \t\tif (ctrl->type == V4L2_CTRL_TYPE_MENU &&\n" + " \t\t ctrl->qmenu[ptr.p_s32[idx]][0] == '\\0')\n" "@@ -2918,7 +2918,7 @@ int v4l2_querymenu(struct v4l2_ctrl_handler *hdl, struct v4l2_querymenu *qm)\n" " \t\treturn -EINVAL;\n" " \n" @@ -48,8 +48,8 @@ "+\tif (ctrl->menu_skip_mask & (1ULL << i))\n" " \t\treturn -EINVAL;\n" " \t/* Empty menu items should also be skipped */\n" - " \tif (ctrl->type = V4L2_CTRL_TYPE_MENU) {\n" + " \tif (ctrl->type == V4L2_CTRL_TYPE_MENU) {\n" "-- \n" 2.17.1 -e376915d43a621da03dcb809a5eed0cccba8fc076f15cf69be72a147141c0495 +8b9669790bc90f75cbc4adac408d9de5cff7616854f3b20f4254a3874b030595
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.