From 413f8fc50af3f46bd6bbd9ff64c8db9880b6fd5f Mon Sep 17 00:00:00 2001 From: LaMont Jones Date: Sun, 8 Jul 2007 17:09:38 -0600 Subject: [PATCH] v2.12r-20 --- debian/changelog | 7 +++++++ debian/patches/.10mount.dpatch.swp | Bin 0 -> 16384 bytes debian/patches/00list | 1 + debian/patches/70fstab.dpatch | 31 +++++++++++++++++++++++++++++ 4 files changed, 39 insertions(+) create mode 100644 debian/patches/.10mount.dpatch.swp create mode 100755 debian/patches/70fstab.dpatch diff --git a/debian/changelog b/debian/changelog index 0f2d75a6..126dfd2f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +util-linux (2.12r-20) unstable-UNRELEASED; urgency=low + + * USB unmounting dereferenced a null pointer. Closes: #410031 + - Files: 70fstab.dpatch + + -- LaMont Jones Sun, 17 Jun 2007 06:01:46 -0600 + util-linux (2.12r-19) unstable; urgency=low * mips/mipsel buildds use sudo. Fix install target so that mount.deb diff --git a/debian/patches/.10mount.dpatch.swp b/debian/patches/.10mount.dpatch.swp new file mode 100644 index 0000000000000000000000000000000000000000..2a15d560df3970deb2b0c45d63d6b391c87bce73 GIT binary patch literal 16384 zcmeI2Yit}>6~~7LXx+4>6jVW_Rws7S?0R3bYkT8I671NU)~R3EPMeaH?d;B7&yd-f zVP@8knp7o#pokAh6c7U13JHV&Ayhs9;sX>)DK8;D02QTQqLQ}s3u=XE(-;49XV$xZ zk_bMb+2rS)JNMpm?>Tes>+Dq2+s7yAKvq@oxmHo0xT$gUinHgHCwD7~rPUof;EbI= zb#r;=0#R-Wy2YgYOGb`gNo^G!P(@^It=nqX5rE=~s~!NZ$>? zoPPo7Q~3Txlzs(iAL%{2!u*$!E+hRwl>QgeCeklOX?!Ux@6=nv^0v~r;FKLpPgEV-56BO^Mm1>9r|z&^dQ)DQlT?tQ1!k4deD2@u~A(;?v>Z~=ll#sXdB#e@Z)TkPoN8QlEtf9*^ zIWj)QmD`k=m@bdb-Z?WL{+%9~8J8W7R9(xRnw~0g#u*ZpFL1Gw+NLgLbgeH)BEWRyF2n0g;#NWfxNKN{>4_FtNDJWrnl<3t-Nq3 zw6dI5mhBjtZ*b*S_EdW|XK|4&vkhUn$cTDlwCc5nTdSUEW$Pl)sw^_9skdiYB4|@F z%8Fbq8f}go$ryC@0xtcNcfqCcG&VY5XyyzIDNU^sv6b;xepYGC@n*-5O^uC|@H9F- z^Fy|-35)w(l$PJ3{P;IEre`5;+3`?l+g5q5K`Gm@rL##{ zXEsiXkzdJa5ChW^_CjE=SG9&Yr@|=_SCMMoaAv-VwJ37siRtN?@?2@Yd~^(Vd3EYhd2#B=rw{bVwTX*H5;|?m&l;WWcb3t< zU3FLZcB`pQude5d>V~qG6TUIIUIMSyvY>3eAX~@Z1KfBjm7-iwcXPTc+{}{WozC{; zJ)w`czo03F=9YT1<}Id87mlTyxP0%AVt3ySJpdSWc14gRwBcddt6;HXJ6k z)7acuV#8=q2L}7r`}D@q&|dL>KNy6vCS4?|>c6cUFu0wEkUqs;tn2Hi=jB=@_i+)4}jX{o(Kp`mEzE99Fva zP_AOyIp3gM!}suwrZCU*+x5{`#%tJ$Jpbct`7@kL`TQ^N^#;!S=lIMIegM7!z6d@A zJ_=?*4x~XhcoT7e3*cq&0{A6(415Yt<8z_L|2+xD_fa3{&0QZCAU z1CB4eh?v2TfCkJ7zd0L_* z&P9uksmo@rWR<_C%ci2r4J@{~U? zsH*tC?u5a+u}eN-G^Jncrm9(9M$kC;P#1L^;S$uexuIvJ?Qx`L<8qO(P8sn+%}UVC zhQ2Xp$uk2XbJCQktOTMv*?e4Wt6X`4YyQrJrL*hZ(P=1V8$$>0baPPS3w|DBgK zorKu)sGDP>PNXp{8D`a>dIO$jXp6k#VHe}A98AE<_yORs*QkZ4ZF&*UhFAl zRksmf3yNJO_mLJgtFg8b^c${gnF9Mx>EB8!*S+Dxjw{1PT{0v~CqiSKNc1+XeM;>cm>nZrg`mqtV6QtA-(4$&D_ z#u5n?F-+9v5Ge*MHi$uh%_9$B&6d{d=wR_g-7e1OZK4hzMo4RDtJ{T5;%=*`8Ef-2}$j!IqQvb$WHOiF=uCLiQzKdy-0Vzg5l;-BUiXu#*P~eddV!cD0uK@k0c9=^|RgYlv121Qr*b0q~I?zRLNw zzyReFAr!%(GE}8mj7`ABw`(L+gqx5GZ_!J()s1f#FQb{Y!? zAzDzE4Tid~qhc5b(pv}ETDX%+MXtxv66{r6;^0B*NkU`*iI7*vsn&FH0>-hepO3e7 zK1ag{n|vV%U2{j_saCJs+R*gS#n$^)OCFndod!IjcGRHQCcRw)I7FKYn7TLkGq=fh zwdFJRBl~dMp_7Hy+`(yKv0BS#!{WR|VA_j>VUDFB&HCWCNWX%+t7~gmw193{=(>45 zUHdhsxtWnq7tPIMUGcCs +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad util-linux-2.12r~/mount/fstab.c util-linux-2.12r/mount/fstab.c +--- util-linux-2.12r~/mount/fstab.c 2004-12-21 20:09:24.000000000 +0100 ++++ util-linux-2.12r/mount/fstab.c 2007-06-05 08:33:15.000000000 +0200 +@@ -293,12 +293,16 @@ + + static int + has_uuid(const char *device, const char *uuid){ +- const char *devuuid; ++ const char *devname; + int ret; + +- devuuid = mount_get_devname_by_uuid(device); +- ret = !strcmp(uuid, devuuid); +- /* free(devuuid); */ ++ devname = mount_get_devname_by_uuid(uuid); ++ /* mount_get_devname_by_uuid return 0 when not found */ ++ if (devname) ++ ret = !strcmp(device, devname); ++ else ++ ret = 0; ++ /* free(devname); */ + return ret; + } + -- 2.39.5