)]}'
{
  "commit": "5130e665cd78fe0b3aa4d7decdeb770e59b66841",
  "tree": "fea7c509642c4e73b1d8fdeb8cd40a2abbeb8c71",
  "parents": [
    "d84153907f743d6d62ecb9be3216622a05d12bcc"
  ],
  "author": {
    "name": "Dan Williams",
    "email": "dan.j.williams@intel.com",
    "time": "Thu May 30 18:04:35 2024 -0700"
  },
  "committer": {
    "name": "Arnav Kansal",
    "email": "rnv@google.com",
    "time": "Thu Oct 03 00:10:36 2024 +0000"
  },
  "message": "PCI: Add missing bridge lock to pci_bus_lock()\n\n[ Upstream commit a4e772898f8bf2e7e1cf661a12c60a5612c4afab ]\n\nOne of the true positives that the cfg_access_lock lockdep effort\nidentified is this sequence:\n\n  WARNING: CPU: 14 PID: 1 at drivers/pci/pci.c:4886 pci_bridge_secondary_bus_reset+0x5d/0x70\n  RIP: 0010:pci_bridge_secondary_bus_reset+0x5d/0x70\n  Call Trace:\n   \u003cTASK\u003e\n   ? __warn+0x8c/0x190\n   ? pci_bridge_secondary_bus_reset+0x5d/0x70\n   ? report_bug+0x1f8/0x200\n   ? handle_bug+0x3c/0x70\n   ? exc_invalid_op+0x18/0x70\n   ? asm_exc_invalid_op+0x1a/0x20\n   ? pci_bridge_secondary_bus_reset+0x5d/0x70\n   pci_reset_bus+0x1d8/0x270\n   vmd_probe+0x778/0xa10\n   pci_device_probe+0x95/0x120\n\nWhere pci_reset_bus() users are triggering unlocked secondary bus resets.\nIronically pci_bus_reset(), several calls down from pci_reset_bus(), uses\npci_bus_lock() before issuing the reset which locks everything *but* the\nbridge itself.\n\nFor the same motivation as adding:\n\n  bridge \u003d pci_upstream_bridge(dev);\n  if (bridge)\n    pci_dev_lock(bridge);\n\nto pci_reset_function() for the \"bus\" and \"cxl_bus\" reset cases, add\npci_dev_lock() for @bus-\u003eself to pci_bus_lock().\n\nBUG\u003db/370702212\nTEST\u003dpresubmit\nRELEASE_NOTE\u003dFixed CVE-2024-46750 in the Linux kernel.\n\ncos-patch: security-moderate\nLink: https://lore.kernel.org/r/171711747501.1628941.15217746952476635316.stgit@dwillia2-xfh.jf.intel.com\nReported-by: Imre Deak \u003cimre.deak@intel.com\u003e\nCloses: http://lore.kernel.org/r/6657833b3b5ae_14984b29437@dwillia2-xfh.jf.intel.com.notmuch\nChange-Id: Idb8b95267586542a4dfd822c999fbffc32c382b0\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\nSigned-off-by: Keith Busch \u003ckbusch@kernel.org\u003e\n[bhelgaas: squash in recursive locking deadlock fix from Keith Busch:\nhttps: //lore.kernel.org/r/20240711193650.701834-1-kbusch@meta.com]\nSigned-off-by: Bjorn Helgaas \u003cbhelgaas@google.com\u003e\nTested-by: Hans de Goede \u003chdegoede@redhat.com\u003e\nTested-by: Kalle Valo \u003ckvalo@kernel.org\u003e\nReviewed-by: Dave Jiang \u003cdave.jiang@intel.com\u003e\nSigned-off-by: Sasha Levin \u003csashal@kernel.org\u003e\nSigned-off-by: Kernel CVE Triage Automation \u003ccloud-image-kernel-cve-triage-automation@prod.google.com\u003e\nReviewed-on: https://cos-review.googlesource.com/c/third_party/kernel/+/82541\nReviewed-by: Arnav Kansal \u003crnv@google.com\u003e\nTested-by: Cusky Presubmit Bot \u003cpresubmit@cos-infra-prod.iam.gserviceaccount.com\u003e\nReviewed-by: Oleksandr Tymoshenko \u003covt@google.com\u003e\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "a0f961a380fa956ac401b1fe6a6193fa25f1bf0b",
      "old_mode": 33188,
      "old_path": "drivers/pci/pci.c",
      "new_id": "53e9e9788bd54d6c92edaf2f9fa277e37e92a973",
      "new_mode": 33188,
      "new_path": "drivers/pci/pci.c"
    }
  ]
}
