shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 02:21:52 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge f9d0a13727 ("lib/buildid: Handle memfd_secret() files in build_id_parse()") into android14-6.1-lts

Browse Source 
Steps on the way to 6.1.132

Change-Id: Ic857f63a2883154a4c5f69c6c58820922d9ccf0e
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2025-04-16 07:43:23 +00:00
parent b2b62f9ec8 f9d0a13727
commit e6079359f7
5 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/clk/samsung/clk-pll.c
View File

@@ -206,6 +206,7 @@ static const struct clk_ops samsung_pll3000_clk_ops = {
*/ */
/* Maximum lock time can be 270 * PDIV cycles */ /* Maximum lock time can be 270 * PDIV cycles */
#define PLL35XX_LOCK_FACTOR (270) #define PLL35XX_LOCK_FACTOR (270)
#define PLL142XX_LOCK_FACTOR (150)
#define PLL35XX_MDIV_MASK (0x3FF) #define PLL35XX_MDIV_MASK (0x3FF)
#define PLL35XX_PDIV_MASK (0x3F) #define PLL35XX_PDIV_MASK (0x3F)
@@ -272,7 +273,11 @@ static int samsung_pll35xx_set_rate(struct clk_hw *hw, unsigned long drate,
} }
/* Set PLL lock time. */ /* Set PLL lock time. */
writel_relaxed(rate->pdiv * PLL35XX_LOCK_FACTOR, if (pll->type == pll_142xx)
writel_relaxed(rate->pdiv * PLL142XX_LOCK_FACTOR,
pll->lock_reg);
else
writel_relaxed(rate->pdiv * PLL35XX_LOCK_FACTOR,
pll->lock_reg); pll->lock_reg);
/* Change PLL PMS values */ /* Change PLL PMS values */

8
drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c
View File

@@ -454,8 +454,10 @@ static int qlcnic_sriov_set_guest_vlan_mode(struct qlcnic_adapter *adapter,
num_vlans = sriov->num_allowed_vlans; num_vlans = sriov->num_allowed_vlans;
sriov->allowed_vlans = kcalloc(num_vlans, sizeof(u16), GFP_KERNEL); sriov->allowed_vlans = kcalloc(num_vlans, sizeof(u16), GFP_KERNEL);
if (!sriov->allowed_vlans) if (!sriov->allowed_vlans) {
qlcnic_sriov_free_vlans(adapter);
return -ENOMEM; return -ENOMEM;
}
vlans = (u16 *)&cmd->rsp.arg[3]; vlans = (u16 *)&cmd->rsp.arg[3];
for (i = 0; i < num_vlans; i++) for (i = 0; i < num_vlans; i++)
@@ -2167,8 +2169,10 @@ int qlcnic_sriov_alloc_vlans(struct qlcnic_adapter *adapter)
vf = &sriov->vf_info[i]; vf = &sriov->vf_info[i];
vf->sriov_vlans = kcalloc(sriov->num_allowed_vlans, vf->sriov_vlans = kcalloc(sriov->num_allowed_vlans,
sizeof(*vf->sriov_vlans), GFP_KERNEL); sizeof(*vf->sriov_vlans), GFP_KERNEL);
if (!vf->sriov_vlans) if (!vf->sriov_vlans) {
qlcnic_sriov_free_vlans(adapter);
return -ENOMEM; return -ENOMEM;
}
} }
return 0; return 0;

2
init/Kconfig
View File

@@ -1935,7 +1935,7 @@ config RUST
depends on !GCC_PLUGINS depends on !GCC_PLUGINS
depends on !RANDSTRUCT depends on !RANDSTRUCT
depends on !SHADOW_CALL_STACK depends on !SHADOW_CALL_STACK
depends on !DEBUG_INFO_BTF || PAHOLE_HAS_LANG_EXCLUDE depends on !DEBUG_INFO_BTF || (PAHOLE_HAS_LANG_EXCLUDE && !LTO)
help help
Enables Rust support in the kernel. Enables Rust support in the kernel.

5
lib/buildid.c
View File

@@ -5,6 +5,7 @@
#include <linux/elf.h> #include <linux/elf.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/pagemap.h> #include <linux/pagemap.h>
#include <linux/secretmem.h>
#define BUILD_ID 3 #define BUILD_ID 3
@@ -157,6 +158,10 @@ int build_id_parse(struct vm_area_struct *vma, unsigned char *build_id,
if (!vma->vm_file) if (!vma->vm_file)
return -EINVAL; return -EINVAL;
/* reject secretmem folios created with memfd_secret() */
if (vma_is_secretmem(vma))
return -EFAULT;
page = find_get_page(vma->vm_file->f_mapping, 0); page = find_get_page(vma->vm_file->f_mapping, 0);
if (!page) if (!page)
return -EFAULT; /* page not mapped */ return -EFAULT; /* page not mapped */

7
sound/soc/amd/yc/acp6x-mach.c
View File

@@ -248,6 +248,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = {
DMI_MATCH(DMI_PRODUCT_NAME, "21M5"), DMI_MATCH(DMI_PRODUCT_NAME, "21M5"),
} }
}, },
{
.driver_data = &acp6x_card,
.matches = {
DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
DMI_MATCH(DMI_PRODUCT_NAME, "21M6"),
}
},
{ {
.driver_data = &acp6x_card, .driver_data = &acp6x_card,
.matches = { .matches = {