a85714545f
In grub-core/video/readers/jpeg.c, the height and width of a JPEG image don't have an upper limit for how big the JPEG image can be. In Coverity, this is getting flagged as an untrusted loop bound. This issue can also seen in PNG and TGA format images as well but Coverity isn't flagging it. To prevent this, the constant IMAGE_HW_MAX_PX is being added to include/grub/bitmap.h, which has a value of 16384, to act as an artificial limit and restrict the height and width of images. This value was picked as it is double the current max resolution size, which is 8K. Fixes: CID 292450 Signed-off-by: Alec Brown <alec.r.brown@oracle.com> Reviewed-by: Darren Kenny <darren.kenny@oracle.com> Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
90 lines
2.7 KiB
C
90 lines
2.7 KiB
C
/*
|
|
* GRUB -- GRand Unified Bootloader
|
|
* Copyright (C) 2006,2007 Free Software Foundation, Inc.
|
|
*
|
|
* GRUB is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* GRUB is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef GRUB_BITMAP_HEADER
|
|
#define GRUB_BITMAP_HEADER 1
|
|
|
|
#include <grub/err.h>
|
|
#include <grub/symbol.h>
|
|
#include <grub/types.h>
|
|
#include <grub/video.h>
|
|
|
|
#define IMAGE_HW_MAX_PX 16384
|
|
|
|
struct grub_video_bitmap
|
|
{
|
|
/* Bitmap format description. */
|
|
struct grub_video_mode_info mode_info;
|
|
|
|
/* Pointer to bitmap data formatted according to mode_info. */
|
|
void *data;
|
|
};
|
|
|
|
struct grub_video_bitmap_reader
|
|
{
|
|
/* File extension for this bitmap type (including dot). */
|
|
const char *extension;
|
|
|
|
/* Reader function to load bitmap. */
|
|
grub_err_t (*reader) (struct grub_video_bitmap **bitmap,
|
|
const char *filename);
|
|
|
|
/* Next reader. */
|
|
struct grub_video_bitmap_reader *next;
|
|
};
|
|
typedef struct grub_video_bitmap_reader *grub_video_bitmap_reader_t;
|
|
|
|
void EXPORT_FUNC (grub_video_bitmap_reader_register) (grub_video_bitmap_reader_t reader);
|
|
void EXPORT_FUNC (grub_video_bitmap_reader_unregister) (grub_video_bitmap_reader_t reader);
|
|
|
|
grub_err_t EXPORT_FUNC (grub_video_bitmap_create) (struct grub_video_bitmap **bitmap,
|
|
unsigned int width, unsigned int height,
|
|
enum grub_video_blit_format blit_format);
|
|
|
|
grub_err_t EXPORT_FUNC (grub_video_bitmap_destroy) (struct grub_video_bitmap *bitmap);
|
|
|
|
grub_err_t EXPORT_FUNC (grub_video_bitmap_load) (struct grub_video_bitmap **bitmap,
|
|
const char *filename);
|
|
|
|
/* Return bitmap width. */
|
|
static inline unsigned int
|
|
grub_video_bitmap_get_width (struct grub_video_bitmap *bitmap)
|
|
{
|
|
if (!bitmap)
|
|
return 0;
|
|
|
|
return bitmap->mode_info.width;
|
|
}
|
|
|
|
/* Return bitmap height. */
|
|
static inline unsigned int
|
|
grub_video_bitmap_get_height (struct grub_video_bitmap *bitmap)
|
|
{
|
|
if (!bitmap)
|
|
return 0;
|
|
|
|
return bitmap->mode_info.height;
|
|
}
|
|
|
|
void EXPORT_FUNC (grub_video_bitmap_get_mode_info) (struct grub_video_bitmap *bitmap,
|
|
struct grub_video_mode_info *mode_info);
|
|
|
|
void *EXPORT_FUNC (grub_video_bitmap_get_data) (struct grub_video_bitmap *bitmap);
|
|
|
|
#endif /* ! GRUB_BITMAP_HEADER */
|