| Message ID | 20240920065823.260243-1-quic_raghuvar@quicinc.com |
|---|---|
| State | New |
| Headers | show |
| Series | android-tools-adbd.service: Update ConditionPathExists to /etc | expand |
Hi Khem Raj, This is a request to backport a fix from the master branch to the kirkstone and scarthgap branches. Below are the details of the fix: Bug/CVE: /etc is more suitable for build-time files than /var. Hence change ConditionPathExists from /var/usb-debugging-enabled to /etc/usb-debugging-enabled in android-tools-adbd.service Commit Hash on Master Branch: 8106cfe769aa3f0ebdff7a1caed018f9ab49a090 Stable Branches for Backport: kirkstone, scarthgap Best regards, Raghuvarya S On 9/20/2024 12:28 PM, Raghuvarya S wrote: > To ensure android-tools-adbd.service starts at boot, the path > for ConditionPathExists must be present at build time. /etc is > more suitable for build-time files than /var, which is for > runtime files. Changed ConditionPathExists from > /var/usb-debugging-enabled to /etc/usb-debugging-enabled > > CC: Khem Raj <raj.khem@gmail.com> > CC: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > Signed-off-by: Raghuvarya S <quic_raghuvar@quicinc.com> > --- > .../android-tools/android-tools/android-tools-adbd.service | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/android-tools-adbd.service b/meta-oe/recipes-devtools/android-tools/android-tools/android-tools-adbd.service > index ddf8d7f74..b6661f2e3 100644 > --- a/meta-oe/recipes-devtools/android-tools/android-tools/android-tools-adbd.service > +++ b/meta-oe/recipes-devtools/android-tools/android-tools/android-tools-adbd.service > @@ -1,6 +1,6 @@ > [Unit] > Description=Android Debug Bridge > -ConditionPathExists=/var/usb-debugging-enabled > +ConditionPathExists=/etc/usb-debugging-enabled > Before=android-system.service > > [Service]
On Fri, 20 Sept 2024 at 08:58, Raghuvarya S <quic_raghuvar@quicinc.com> wrote: > > To ensure android-tools-adbd.service starts at boot, the path > for ConditionPathExists must be present at build time. /etc is > more suitable for build-time files than /var, which is for > runtime files. Changed ConditionPathExists from > /var/usb-debugging-enabled to /etc/usb-debugging-enabled > > CC: Khem Raj <raj.khem@gmail.com> > CC: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > Signed-off-by: Raghuvarya S <quic_raghuvar@quicinc.com> NAK. We know that after this one the layer will be inconsistent. And you know that. So you need to pick up two more. Please send all three of them as a single series for backport. > --- > .../android-tools/android-tools/android-tools-adbd.service | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/android-tools-adbd.service b/meta-oe/recipes-devtools/android-tools/android-tools/android-tools-adbd.service > index ddf8d7f74..b6661f2e3 100644 > --- a/meta-oe/recipes-devtools/android-tools/android-tools/android-tools-adbd.service > +++ b/meta-oe/recipes-devtools/android-tools/android-tools/android-tools-adbd.service > @@ -1,6 +1,6 @@ > [Unit] > Description=Android Debug Bridge > -ConditionPathExists=/var/usb-debugging-enabled > +ConditionPathExists=/etc/usb-debugging-enabled > Before=android-system.service > > [Service] > -- > 2.25.1 >
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/android-tools-adbd.service b/meta-oe/recipes-devtools/android-tools/android-tools/android-tools-adbd.service index ddf8d7f74..b6661f2e3 100644 --- a/meta-oe/recipes-devtools/android-tools/android-tools/android-tools-adbd.service +++ b/meta-oe/recipes-devtools/android-tools/android-tools/android-tools-adbd.service @@ -1,6 +1,6 @@ [Unit] Description=Android Debug Bridge -ConditionPathExists=/var/usb-debugging-enabled +ConditionPathExists=/etc/usb-debugging-enabled Before=android-system.service [Service]
To ensure android-tools-adbd.service starts at boot, the path for ConditionPathExists must be present at build time. /etc is more suitable for build-time files than /var, which is for runtime files. Changed ConditionPathExists from /var/usb-debugging-enabled to /etc/usb-debugging-enabled CC: Khem Raj <raj.khem@gmail.com> CC: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Signed-off-by: Raghuvarya S <quic_raghuvar@quicinc.com> --- .../android-tools/android-tools/android-tools-adbd.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)