mirrors/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2026-04-07 03:10:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

dev-util/libtypec: backport a few more patches

Browse Source 
These should all be dropped when upstream does a new release.

Signed-off-by: Adrian Ratiu <adrian.ratiu@collabora.com>
This commit is contained in:
Adrian Ratiu
2024-04-15 14:04:25 +03:00
parent 3ec30d4441
commit 7e6af504b7
8 changed files with 257 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
dev-libs/libtypec/files/libtypec-0.5.0-libtypec-close-fp-before-returning.patch Normal file
View File

@@ -0,0 +1,33 @@
From 67d40a5f0132e2b02167ad274c6d6c76e4393964 Mon Sep 17 00:00:00 2001
From: Colin Ian King <colin.i.king@gmail.com>
Date: Thu, 4 Jan 2024 09:42:54 +0000
Subject: [PATCH] libtypec: close fp before returning
Fix resource leak on fp on error return path, close fp before
returning.
Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
Upstream-Status: Backport [upstream commit 67d40a5]
---
libtypec_sysfs_ops.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libtypec_sysfs_ops.c b/libtypec_sysfs_ops.c
index 747b562..a22de5a 100644
--- a/libtypec_sysfs_ops.c
+++ b/libtypec_sysfs_ops.c
@@ -504,8 +504,10 @@ static int count_billbrd_if(const char *usb_path, const struct stat *sb, int typ
if(num_bb_if < MAX_BB_PATH_STORED)
{
int len = strlen(usb_path);
- if(len > 512 ) /*exceeds buffer size*/
+ if(len > 512 ) { /*exceeds buffer size*/
+ fclose(fd);
return 0;
+ }
strcpy(bb_dev_path[num_bb_if],usb_path);
}
--
2.43.2

30
dev-libs/libtypec/files/libtypec-0.5.0-libtypec-utils-add-missing-break-in-switch-statement.patch Normal file
View File

@@ -0,0 +1,30 @@
From 7de1000ff658c594a8f0a4b62f4956fc635d6c23 Mon Sep 17 00:00:00 2001
From: Colin Ian King <colin.i.king@gmail.com>
Date: Thu, 4 Jan 2024 09:46:19 +0000
Subject: [PATCH] libtypec: utils: add missing break in switch statement
For the product_type_pd3p1_drd case there is a missing break
statement causing an unintentional fall-through to the default
case. Add in the missing break statement.
Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
Upstream-Status: Backport [upstream commit 7de1000]
---
utils/lstypec.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/utils/lstypec.c b/utils/lstypec.c
index a30b2bc..98d23f6 100644
--- a/utils/lstypec.c
+++ b/utils/lstypec.c
@@ -396,6 +396,7 @@ void print_identity_data(int recipient, union libtypec_discovered_identity id, s
printf(" Product VDO 2: 0x%08x\n", id.disc_id.product_type_vdo2);
printf(" Product VDO 3: 0x%08x\n", id.disc_id.product_type_vdo3);
print_vdo(((uint32_t) id.disc_id.product_type_vdo3), 6, pd3p1_dfp_fields, pd3p1_dfp_field_desc);
+ break;
default:
printf(" Product VDO 1: 0x%08x\n", id.disc_id.product_type_vdo1);
printf(" Product VDO 2: 0x%08x\n", id.disc_id.product_type_vdo2);
--
2.43.2

31
dev-libs/libtypec/files/libtypec-0.5.0-libtypec-utils-add-missing-return-at-end-of-fun.patch Normal file
View File

@@ -0,0 +1,31 @@
From 6d193776421db948e4201a60cf239fdae62c196d Mon Sep 17 00:00:00 2001
From: Colin Ian King <colin.i.king@gmail.com>
Date: Thu, 4 Jan 2024 09:52:57 +0000
Subject: [PATCH] libtypec: utils: add missing return at end of function
Function typecstatus_power_contract is missing a return 0 at the
end of the function, currently it is returning nothing and so
it may be returning a garbage value.
Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
Upstream-Status: Backport [upstream commit 6d19377]
---
utils/typecstatus.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/utils/typecstatus.c b/utils/typecstatus.c
index 5e16e74..bfb4142 100644
--- a/utils/typecstatus.c
+++ b/utils/typecstatus.c
@@ -208,7 +208,7 @@ int typecstatus_power_contract()
printf("\tNo Power Contract on port %d\n",i);
}
}
-
+ return 0;
}
/* Check all typec ports */
--
2.43.2

30
dev-libs/libtypec/files/libtypec-0.5.0-libtypec-utils-add-missing-return-at-end-of-function.patch Normal file
View File

@@ -0,0 +1,30 @@
From d15c9d17148632b7864990c29854321b891c95c3 Mon Sep 17 00:00:00 2001
From: Colin Ian King <colin.i.king@gmail.com>
Date: Thu, 4 Jan 2024 09:44:04 +0000
Subject: [PATCH] libtypec: utils: add missing return at end of function
Function typec_status_billboard is missing a return 0 at the
end of the function, currently it is returning nothing and so
it may be returning a garbage value.
Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
Upstream-Status: Backport [upstream commit d15c9d1]
---
utils/typecstatus.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/utils/typecstatus.c b/utils/typecstatus.c
index 43801c0..5e16e74 100644
--- a/utils/typecstatus.c
+++ b/utils/typecstatus.c
@@ -169,6 +169,7 @@ int typec_status_billboard()
}
}
+ return 0;
}
int typecstatus_power_contract()
--
2.43.2

44
dev-libs/libtypec/files/libtypec-0.5.0-libtypec-utils-close-fp-before-returning.patch Normal file
View File

@@ -0,0 +1,44 @@
From 477b08cea7e27da5fb97ce52d0af3d2c98f4f98f Mon Sep 17 00:00:00 2001
From: Colin Ian King <colin.i.king@gmail.com>
Date: Thu, 4 Jan 2024 09:41:04 +0000
Subject: [PATCH] libtypec: utils: close fp before returning
Fix resource leak on fp on error return path, close fp before
returning.
Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
Upstream-Status: Backport [upstream commit 477b08c]
---
utils/typecstatus.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/utils/typecstatus.c b/utils/typecstatus.c
index be906a4..43801c0 100644
--- a/utils/typecstatus.c
+++ b/utils/typecstatus.c
@@ -92,11 +92,13 @@ static unsigned long get_dword_from_path(char *path)
FILE *fp = fopen(path, "r");
- if (fp == NULL)
+ if (fp == NULL)
return -1;
- if(fgets(buf, 64, fp) == NULL)
+ if(fgets(buf, 64, fp) == NULL) {
+ fclose(fp);
return -1;
+ }
dword = strtoul(buf, NULL, 10);
@@ -253,4 +255,4 @@ int main (int argc, char **argv)
}
names_exit();
-}
\ No newline at end of file
+}
--
2.43.2

82
dev-libs/libtypec/files/libtypec-0.5.0-typecstatus-fix-potential-overflow.patch Normal file
View File

@@ -0,0 +1,82 @@
From 026acf3f2688631af2951630d3b9588badc65ca6 Mon Sep 17 00:00:00 2001
From: Rajaram Regupathy <rajaram.regupathy@gmail.com>
Date: Sun, 14 Apr 2024 14:55:15 +0530
Subject: [PATCH] typecstatus : fix potential overflow
check index returned and use to avoid potential buffer overflow
Upstream-Status: Backport [upstream commit 026acf3]
---
utils/typecstatus.c | 44 +++++++++++++++++++++++---------------------
1 file changed, 23 insertions(+), 21 deletions(-)
diff --git a/utils/typecstatus.c b/utils/typecstatus.c
index bfb4142..7ca7669 100644
--- a/utils/typecstatus.c
+++ b/utils/typecstatus.c
@@ -133,40 +133,42 @@ int typec_status_billboard()
bb_loc = find_bb_bos_index(bb_data,ret);
- struct bb_bos_descritor *bb_bos_desc = (struct bb_bos_descritor *)&bb_data[bb_loc];
+ if(bb_loc > 0 )
+ {
+ struct bb_bos_descritor *bb_bos_desc = (struct bb_bos_descritor *)&bb_data[bb_loc];
- printf("\tBillboard Device Version : %x.%x\n",bb_bos_desc->cap_desc_bcd_ver[1],bb_bos_desc->cap_desc_bcd_ver[0]);
+ printf("\tBillboard Device Version : %x.%x\n",bb_bos_desc->cap_desc_bcd_ver[1],bb_bos_desc->cap_desc_bcd_ver[0]);
- printf("\tNumber of Alternate Mode : %d\n",bb_bos_desc->cap_desc_num_aum);
+ printf("\tNumber of Alternate Mode : %d\n",bb_bos_desc->cap_desc_num_aum);
- for(int x=0;x<bb_bos_desc->cap_desc_num_aum;x++)
- {
- int idx = 0, k=0, j=0;
- #define bmCONF_STR_ARR_MAX 4
+ for(int x=0;x<bb_bos_desc->cap_desc_num_aum;x++)
+ {
+ int idx = 0, k=0, j=0;
+ #define bmCONF_STR_ARR_MAX 4
- char *bmconf_str_array[]= {"Unspecified Error","AUM not attempted","AUM attempt unsuccessful","AUM configuration successful","Undefined Configuration"};
+ char *bmconf_str_array[]= {"Unspecified Error","AUM not attempted","AUM attempt unsuccessful","AUM configuration successful","Undefined Configuration"};
- if( (x !=0) && ((x % 4) == 0))
- {
- j++;
- k=0;
- }
+ if( (x !=0) && ((x % 4) == 0))
+ {
+ j++;
+ k=0;
+ }
- idx = bb_bos_desc->cap_desc_bmconfig[j];
+ idx = bb_bos_desc->cap_desc_bmconfig[j];
- idx = (idx >> k) & 0x3;
+ idx = (idx >> k) & 0x3;
- k++;
+ k++;
- idx = idx < bmCONF_STR_ARR_MAX ? idx : bmCONF_STR_ARR_MAX;
+ idx = idx < bmCONF_STR_ARR_MAX ? idx : bmCONF_STR_ARR_MAX;
- char *aum = &bb_bos_desc->cap_desc_aum_array_start;
+ char *aum = &bb_bos_desc->cap_desc_aum_array_start;
- aum = aum + (x*4);
+ aum = aum + (x*4);
- printf("\tAlternate Mode 0x%02X%02X in state : %s\n",aum[1]&0xFF,aum[0]&0xFF,bmconf_str_array[idx]);
+ printf("\tAlternate Mode 0x%02X%02X in state : %s\n",aum[1]&0xFF,aum[0]&0xFF,bmconf_str_array[idx]);
+ }
}
-
}
}
return 0;
--
2.43.2

1
dev-libs/libtypec/libtypec-0.5.0-r1.ebuild Symbolic link
View File

@@ -0,0 +1 @@
libtypec-0.5.0.ebuild

6
dev-libs/libtypec/libtypec-0.5.0.ebuild
View File

@@ -19,6 +19,12 @@ PATCHES=(
"${FILESDIR}/${PN}-0.5.0-CMakeLists.txt-fix-pkgconfig-install-path.patch"
"${FILESDIR}/${PN}-0.5.0-sysfs_ops-define-feature-test-macro-for-nft.patch"
"${FILESDIR}/${PN}-0.5.0-sysfs_ops-fix-nftw-fun-pointer-def.patch"
"${FILESDIR}/${PN}-0.5.0-libtypec-utils-close-fp-before-returning.patch"
"${FILESDIR}/${PN}-0.5.0-libtypec-close-fp-before-returning.patch"
"${FILESDIR}/${PN}-0.5.0-libtypec-utils-add-missing-return-at-end-of-fun.patch"
"${FILESDIR}/${PN}-0.5.0-libtypec-utils-add-missing-return-at-end-of-function.patch"
"${FILESDIR}/${PN}-0.5.0-libtypec-utils-add-missing-break-in-switch-statement.patch"
"${FILESDIR}/${PN}-0.5.0-typecstatus-fix-potential-overflow.patch"
)
src_configure() {