Fix for CID 314037
cover Fix for CID 314037
Hi,
This patch confirms that Allocation Extent Descriptor length is with limits based on section "2.3.11 Allocation Extent Descriptor" in the following UDF spec:
http://www.osta.org/specs/pdf/udf201.pdf
The above document describes the limit for the length of extent of allocation descriptors, and the limit is the logical block size.
Ran Coverity test to confirm the CID was fixed, and ran "make check" to confirm that the UDF test passed.
Thank you!
Jagannathan Raman (1):
fs/udf: validate length of AED in grub_udf_read_block()
grub-core/fs/udf.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)
Signature · 1 line
2.20.1
PATCH 1/1 fs/udf: validate length of AED in grub_udf_read_block()
Validate the length of Allocation Extent Descriptor in grub_udf_read_block(), based on the details in UDF spec. v2.01 section 2.3.11
--- grub-core/fs/udf.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)
grub-core/fs/udf.c +28 -0
@@ -510,6 +510,20 @@ grub_udf_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock) } len =U32 (extension->ae_len); +/* +* Ensure AE length is less than block size +* per UDF spec v2.01 section 2.3.11 +* +* node->data->lbshift is initialized by +* grub_udf_mount(). lbshift has a maximum value +* of 3 and it does not cause an overflow here. +*/ +if (len <0 || len > ((grub_ssize_t )1 << node->data->lbshift)) + { +grub_error (GRUB_ERR_BAD_FS ,"invalid ae length" ); + goto fail; + } + ad = (struct grub_udf_short_ad *) (buf +sizeof (struct grub_udf_aed ));continue ;
@@ -563,6 +577,20 @@ grub_udf_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock) } len =U32 (extension->ae_len); +/* +* Ensure AE length is less than block size +* per UDF spec v2.01 section 2.3.11 +* +* node->data->lbshift is initialized by +* grub_udf_mount(). lbshift has a maximum value +* of 3 and it does not cause an overflow here. +*/ +if (len <0 || len > ((grub_ssize_t )1 << node->data->lbshift)) + { +grub_error (GRUB_ERR_BAD_FS ,"invalid ae length" ); + goto fail; + } + ad = (struct grub_udf_long_ad *) (buf +sizeof (struct grub_udf_aed ));continue ;
Signature · 1 line
2.20.1
Re: [PATCH 1/1] fs/udf: validate length of AED in grub_udf_read_block()
Quoted 7 lines · Jagannathan Raman
Validate the length of Allocation Extent Descriptor in
grub_udf_read_block(), based on the details in UDF spec. v2.01 section 2.3.11Fixes CID 314037Signed-off-by Jagannathan Raman <[email protected]>
Daniel
Re: [PATCH 1/1] fs/udf: validate length of AED in grub_udf_read_block()
Quoted 9 lines · Daniel Kiper
Quoted 4 lines · Jagannathan Raman
Validate the length of Allocation Extent Descriptor in
grub_udf_read_block(), based on the details in UDF spec. v2.01 section 2.3.11
Quoted 5 lines
Quoted 3 lines
Fixes CID 314037Signed-off-by Jagannathan Raman <[email protected]>Reviewed-by Daniel Kiper <[email protected]>
Thank you!
Quoted 2 lines
Daniel
Re: [PATCH 1/1] fs/udf: validate length of AED in grub_udf_read_block()
Quoted 6 lines · Jag Raman
Quoted 6 lines · Daniel Kiper
Quoted 4 lines · Jagannathan Raman
Validate the length of Allocation Extent Descriptor in
grub_udf_read_block(), based on the details in UDF spec. v2.01 section 2.3.11
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
Fixes CID 314037Signed-off-by Jagannathan Raman <[email protected]>Reviewed-by Daniel Kiper <[email protected]>Thank you!
My pleasure!
And thank you for fixing this issue!
Daniel