Message-ID: <8d91b763-f038-af05-8917-6bec2da186b4@oracle.com>
Date:   Mon, 13 Dec 2021 10:29:08 -0500
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101
 Thunderbird/91.3.2
Content-Language: en-US
To:     "geert@linux-m68k.org >> Geert Uytterhoeven" <geert@linux-m68k.org>,
        Andrew Morton <akpm@linux-foundation.org>
Cc:     LKML <linux-kernel@vger.kernel.org>,
        Dan Carpenter <dan.carpenter@oracle.com>
From:   George Kennedy <george.kennedy@oracle.com>
Subject: [PATCH v2 RESEND 2] video: fbdev: cirrusfb: check pixclock to avoid
 divide by zero
Organization: Oracle Corporation
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?UlFFYW1GbzV0d3lCKzF0R1YrQUI4NEs3ZzUwYXFJOHN4NjFNZmxTbG01UTFB?=
 =?utf-8?B?c3VyWDY1SDFjbXB5QkIxZlRVTkV4SC9TcEFLMTVRZ2dycWZCZlJOc1VTRWVq?=
 =?utf-8?B?UVdDWk1EZ1hyNWUydG1IckI0VnF4K0swc2h2dlNqcHZQcmp3TzMrNUpRSlZr?=
 =?utf-8?B?L09wN2hWSVd0RXVIT09XcVZ2QUhQTkg0d044WjVMaHBTdWpZbVJXcmhnbjh4?=
 =?utf-8?B?am52T0lzVG1ka2d0citFMDVsejBLNm92UlJFdTFVempvcUg5c1U1eTJ5SVJW?=
 =?utf-8?B?U3ZRVWZndVhmN0E5bjN2Z1Q3MEl1ZEpBQkxNbWRTNVJhU0t0Y1lkUDhxcHBX?=
 =?utf-8?B?SmVtMkRmRFE4T3RPbUhVWi9nRm1iMi9HVDRjSWlocTR4MUdjWjJ6bzVEUnRJ?=
 =?utf-8?B?bncvSXZJT1dCb0J2V1A3QWNKa0pja1BMWjNEd1dPd204M3FqSGhFWkFTRnk5?=
 =?utf-8?B?V2FNM1BlU0o0OE1nOTZrOW5nYW1tOVByQkZWa1Z6bWdaOVlhU0NpMnMxQm00?=
 =?utf-8?B?eTRUeU54b0dVWCtjL0N6Y0VjYTdHWWJERHdBV0lhemZHaEg0ODVuczR4bUhI?=
 =?utf-8?B?a0E2QjVGcER6ZDJ4b0t4ZmJZelZIcnJzaFY0ZkdsaUpuUDgvVzV6c2R3bkg0?=
 =?utf-8?B?azZTZHloWFJkdHFRSFliNXluVnBmbmFGQVl5bkpQSFhmK0Q5dmhwZjB1bG5M?=
 =?utf-8?B?ZlpVYjFkUEtZMFJYMmhWMWM0ejRtdFkzdHFpWjJXZ3ZLQXowVy9ZbmlQSjNr?=
 =?utf-8?B?VThZVDlkeEdpdEhDcEZ3OEhHRWtXeFhMY05vbS8zelFFTVR5UHpkaXFJVUlL?=
 =?utf-8?B?OFBhM3E2cWNZVnJZSkYyNnlMR3RHV3I5TFg4aDZPbG0xeEdlMEt5bjFobHZE?=
 =?utf-8?B?REJFZC9HampGbXB4ZHVndDVHbDlGWVVGVVhkQmNlOEt3NmU2c1JRM1NpR1M4?=
 =?utf-8?B?YmIwK0taM1I1alhqNUFqWHFMUVAyL0VYdjdzVkNXd1FDQTczZ2k2elN5Yk5n?=
 =?utf-8?B?Zi9GVHFKbUZvV3ZVcmc2SzRoRHBKS0NqbW9iS051b3VTbUI1NkJFRkxRaTE2?=
 =?utf-8?B?enRNU1pqVE5XMzU4WVhVZ3ZaRjAyZ0w3R3lPZDFPRFY1NEplc0FQNmNDd016?=
 =?utf-8?B?MThuSWNhS2NQVXRCQ0NQd0dVbW5BNDRYR0M5ZWpkZnQwSWV6SjVseWJ2VkNR?=
 =?utf-8?B?MEJMTUM2QWZqSHhwSElzejVSK3laN0FrUTVkWEZxMUorbTdaUlI1SWNOeTU0?=
 =?utf-8?B?bXhvT3BjSHZVaW9tdG5xWENtZDNxdldTaUh3ZEw3Mytqa01QTUFGZjdTcnU2?=
 =?utf-8?B?SnRzeFlNd2w0L09SM2JUQ1R2NkZyRmF4UUp1akRBZVJ6QU5Gb3FadlpSWUtO?=
 =?utf-8?B?YlZNSWN6VUJHVDB3QjBJeFBqam92QUE3VUJlb1pQc3A3USt0dVNFVzNMSCta?=
 =?utf-8?B?bUZIUVphQVZ1RkJhZFUxL0l3QTlXZkZEWms1azdCanRBVVJYZkZjaVljcTNz?=
 =?utf-8?B?OGNuT1FpMk00MndRRUFsbGF0N1FhN2NWZ0Qvem03UmVXRWFFUnFYYXphcnhS?=
 =?utf-8?B?S01NRU0yWU4rRENqMFdFNUlGZDJYekRQeUE4amI0d3QvV2JoYUQ1a1IwTWhj?=
 =?utf-8?B?ZU9HV25XclJPZzJjZkpwL2h0VDAzbkpiaWpwRWcyM0lWWDR4NXpodmVRZDE3?=
 =?utf-8?B?MTYvNUxSNWJreldyVmJZSUgydjRqRG1lbHFwSkJVSlYzMENxdFF4MC9obmlV?=
 =?utf-8?B?TEFoRUg5cFRrSXNrZEhRNGhuSmg5T2VWUFR5L3ZDNkF2c3kxazBNTG91aE9B?=
 =?utf-8?B?SzBxYlgxWEs3MXlGMHNtLzV3dVBRaFQ4WHFKaWR4VUpDZ2o5Wlh0VitwMlRJ?=
 =?utf-8?B?MUJpOGFkVC9jSzZCSHNoR3lPQVg4S1F1MjlFWXYzbVBiNHJVbmdCNE9Qay8r?=
 =?utf-8?B?ZWlUZkZCVEQxbmV1enJJOWp1SmY1WnExMTVSS1JQNVNVeVBrc3dGNE4vcUtn?=
 =?utf-8?B?TVpwcmY2VkwzbUtuY0RUQTVWaG9pOEhZOFM4cE83Um0xYzM2eE9TeXREM1pJ?=
 =?utf-8?B?THphbVZUc0NwU3ZybURhQVJza3dSUVNJcC9oMVNLU0V6U2sxQVZZYWhlaHQy?=
 =?utf-8?B?RXB2Z2RlR0FLd1ZzaUdzSW5qNlZ3cXNEZDVQcDEvN2lybmNrSmgzWjFXY0ZG?=
 =?utf-8?B?RmVRSEgrYTBLTTJBbDJwMmVEbVJmbmozWkU3TzV0Lzd3U2J5SmV1d090aWZQ?=
 =?utf-8?B?bzBmZldxc2k5SG8vOEYyL0VncUd3PT0=?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 27b3006a-d1fc-4f6f-a8cd-08d9be4d50ad
X-MS-Exchange-CrossTenant-AuthSource: BN0PR10MB5192.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Dec 2021 15:29:12.6203
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 8+7i2beIKfsWnYW8wAD7K2pQ9AAYc9DRZcZDsrUNrE9OkBTHFLjFB/fSk2Bp6vBvmpADlYkVlDaa7Cr7LIBvreEe8lqzvW4saB1ZleQ6bY0=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN0PR10MB5062
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10196 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 adultscore=0 suspectscore=0
 mlxlogscore=999 phishscore=0 malwarescore=0 bulkscore=0 mlxscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000
 definitions=main-2112130098
X-Proofpoint-ORIG-GUID: bW0ytRJXY2ku8OnStMuPlpa40RD7yBDS
X-Proofpoint-GUID: bW0ytRJXY2ku8OnStMuPlpa40RD7yBDS
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Do a sanity check on pixclock value to avoid divide by zero.

If the pixclock value is zero, the cirrusfb driver will round up
pixclock to get the derived frequency as close to maxclock as
possible.

Syzkaller reported a divide error in cirrusfb_check_pixclock.

divide error: 0000 [#1] SMP KASAN PTI
CPU: 0 PID: 14938 Comm: cirrusfb_test Not tainted 5.15.0-rc6 #1
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.11.0-2
RIP: 0010:cirrusfb_check_var+0x6f1/0x1260

Call Trace:
  fb_set_var+0x398/0xf90
  do_fb_ioctl+0x4b8/0x6f0
  fb_ioctl+0xeb/0x130
  __x64_sys_ioctl+0x19d/0x220
  do_syscall_64+0x3a/0x80
  entry_SYSCALL_64_after_hwframe+0x44/0xae

Cc: <stable@vger.kernel.org> # 5.4.y
Reported-by: syzkaller <syzkaller@googlegroups.com>
Signed-off-by: George Kennedy<george.kennedy@oracle.com>
Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
Hi Andrew, can you pick this patch up?  Some of the fbdev drivers have
maintainers but the cirrusfb.c is basically orphaned.  I sent this patch
in Oct and again in Dec and no one picked it up.  Geert has reviewed it.
Obviously the original code just crashed so this shouldn't be
controversial.

v2: Geert says that instead of just returning an error, this is supposed
to find a valid pixclock and use that.

RESEND: Added the Reviewed by: and Cc: <stable@vger.kernel.org>

Thank you,
George

  drivers/video/fbdev/cirrusfb.c | 16 ++++++++--------
  1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/video/fbdev/cirrusfb.c 
b/drivers/video/fbdev/cirrusfb.c
index 93802ab..3d47c34 100644
--- a/drivers/video/fbdev/cirrusfb.c
+++ b/drivers/video/fbdev/cirrusfb.c
@@ -469,7 +469,7 @@ static int cirrusfb_check_mclk(struct fb_info *info, 
long freq)
      return 0;
  }

-static int cirrusfb_check_pixclock(const struct fb_var_screeninfo *var,
+static int cirrusfb_check_pixclock(struct fb_var_screeninfo *var,
                     struct fb_info *info)
  {
      long freq;
@@ -478,9 +478,7 @@ static int cirrusfb_check_pixclock(const struct 
fb_var_screeninfo *var,
      unsigned maxclockidx = var->bits_per_pixel >> 3;

      /* convert from ps to kHz */
-    freq = PICOS2KHZ(var->pixclock);
-
-    dev_dbg(info->device, "desired pixclock: %ld kHz\n", freq);
+    freq = PICOS2KHZ(var->pixclock ? : 1);

      maxclock = cirrusfb_board_info[cinfo->btype].maxclock[maxclockidx];
      cinfo->multiplexing = 0;
@@ -488,11 +486,13 @@ static int cirrusfb_check_pixclock(const struct 
fb_var_screeninfo *var,
      /* If the frequency is greater than we can support, we might be able
       * to use multiplexing for the video mode */
      if (freq > maxclock) {
-        dev_err(info->device,
-            "Frequency greater than maxclock (%ld kHz)\n",
-            maxclock);
-        return -EINVAL;
+        var->pixclock = KHZ2PICOS(maxclock);
+
+        while ((freq = PICOS2KHZ(var->pixclock)) > maxclock)
+            var->pixclock++;
      }
+    dev_dbg(info->device, "desired pixclock: %ld kHz\n", freq);
+
      /*
       * Additional constraint: 8bpp uses DAC clock doubling to allow 
maximum
       * pixel clock
-- 1.8.3.1